summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/jdk/.footprint.i6865
-rw-r--r--base/jdk/.md5sum.i6862
-rw-r--r--base/kernel-precision-380/Pkgfile66
-rw-r--r--base/kernel-precision-380/post-install44
4 files changed, 62 insertions, 55 deletions
diff --git a/base/jdk/.footprint.i686 b/base/jdk/.footprint.i686
index 94828debb..394e7cfad 100644
--- a/base/jdk/.footprint.i686
+++ b/base/jdk/.footprint.i686
@@ -6,8 +6,6 @@ drwxr-xr-x root/root opt/jdk/
-r--r--r-- root/root opt/jdk/COPYRIGHT
-rw-r--r-- root/root opt/jdk/LICENSE
-rw-r--r-- root/root opt/jdk/README.html
--r--r--r-- root/root opt/jdk/README_ja.html
--r--r--r-- root/root opt/jdk/README_zh_CN.html
-r--r--r-- root/root opt/jdk/THIRDPARTYLICENSEREADME.txt
drwxr-xr-x root/root opt/jdk/bin/
lrwxrwxrwx root/root opt/jdk/bin/ControlPanel -> ../jre/bin/ControlPanel
@@ -269,6 +267,8 @@ drwxr-xr-x root/root opt/jdk/jre/lib/ext/
-rw-r--r-- root/root opt/jdk/jre/lib/fontconfig.RedHat.3.properties.src
-r--r--r-- root/root opt/jdk/jre/lib/fontconfig.RedHat.4.bfc
-rw-r--r-- root/root opt/jdk/jre/lib/fontconfig.RedHat.4.properties.src
+-r--r--r-- root/root opt/jdk/jre/lib/fontconfig.RedHat.6.0.bfc
+-rw-r--r-- root/root opt/jdk/jre/lib/fontconfig.RedHat.6.0.properties.src
-r--r--r-- root/root opt/jdk/jre/lib/fontconfig.RedHat.bfc
-rw-r--r-- root/root opt/jdk/jre/lib/fontconfig.RedHat.properties.src
-r--r--r-- root/root opt/jdk/jre/lib/fontconfig.SuSE.11.bfc
@@ -606,6 +606,7 @@ drwxr-xr-x root/root opt/jdk/jre/lib/zi/America/Kentucky/
-rw-r--r-- root/root opt/jdk/jre/lib/zi/America/Nome
-rw-r--r-- root/root opt/jdk/jre/lib/zi/America/Noronha
drwxr-xr-x root/root opt/jdk/jre/lib/zi/America/North_Dakota/
+-rw-r--r-- root/root opt/jdk/jre/lib/zi/America/North_Dakota/Beulah
-rw-r--r-- root/root opt/jdk/jre/lib/zi/America/North_Dakota/Center
-rw-r--r-- root/root opt/jdk/jre/lib/zi/America/North_Dakota/New_Salem
-rw-r--r-- root/root opt/jdk/jre/lib/zi/America/Ojinaga
diff --git a/base/jdk/.md5sum.i686 b/base/jdk/.md5sum.i686
index 8fb0cbf85..649ffac23 100644
--- a/base/jdk/.md5sum.i686
+++ b/base/jdk/.md5sum.i686
@@ -1,3 +1,3 @@
94065b612df0046d9ae758943f9f6a75 construct.sh
-3acbe2368cfb5149b04f980184331e33 jdk-6u24-dlj-linux-i586.bin
+f11b093c0f646dd2bf348cadd388ad1f jdk-6u25-dlj-linux-i586.bin
c51e76d9742a5d3b0cd8b2394b881160 jdk.sh
diff --git a/base/kernel-precision-380/Pkgfile b/base/kernel-precision-380/Pkgfile
index 55f601906..bc7d1ffdf 100644
--- a/base/kernel-precision-380/Pkgfile
+++ b/base/kernel-precision-380/Pkgfile
@@ -6,14 +6,14 @@
name=kernel-precision-380
version=2.6.37.6
_BaseVersion=2.6.37
-release=1
+release=2
PKGMK_NO_STRIP="yes"
PKGMK_IGNORE_FOOTPRINT="yes"
PKGMK_IGNORE_MD5SUM="yes"
SCRIPT_VERSION="pakxe"
-INITRDBASE="nutyx-initrd-$SCRIPT_VERSION"
-_extra=01032011
-_tools=01032011
+INITRDBASE="nutyx-initrd"
+_extra=26042011
+_tools=26042011
source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\
http://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2 \
http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash\
@@ -21,9 +21,7 @@ source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz
http://nutyx.meticul.eu/files/installtools-${_tools}.tar.bz2)
build(){
-unset MAKEFLAGS
-cp -a script $INITRDBASE/
-cp -a rootfs/* $INITRDBASE/rootfs/
+# unset MAKEFLAGS
for i in setup-install setup-mirroir
do
sed -i "s|#INSTALL#|install-$SCRIPT_VERSION.ash|" \
@@ -35,41 +33,48 @@ do
$INITRDBASE/rootfs/install/$i
done
cd linux-${_BaseVersion}
-
make mrproper
case `uname -m` in
- x86_64)
- mv $SRC/config_64 ./.config;;
- i?86)
- mv $SRC/config ./.config;;
+ x86_64)
+ mv $SRC/config_64 ./.config;;
+ i?86)
+ mv $SRC/config ./.config;;
esac
-bzip2 -d -c ../patch-$version.bz2 | patch -Np1
+if [ -f ../patch-$version.bz2 ]; then
+ bzip2 -d -c ../patch-$version.bz2 | patch -Np1
+fi
sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
-make menuconfig
+# make menuconfig
case `uname -m` in
x86_64)
- cp .config `prt-get printf %p --filter=kernel`/$name/config_64;;
+ cp .config `prt-get printf %p --filter=$name`/$name/config_64;;
i?86)
- cp .config `prt-get printf %p --filter=kernel`/$name/config;;
+ cp .config `prt-get printf %p --filter=$name`/$name/config;;
esac
make
+case `uname -m` in
+ x86_64)
+ cp .config `prt-get printf %p --filter=$name`/$name/config_64;;
+ i?86)
+ cp .config `prt-get printf %p --filter=$name`/$name/config;;
+esac
make INSTALL_MOD_PATH=$PKG modules_install
mkdir -p $PKG/boot
case `uname -m` in
- x86_64)
- cp System.map \
- $PKG/boot/System_64.map-$version
- cp .config \
- $PKG/boot/config_64-$version
- cp arch/x86_64/boot/bzImage \
- $PKG/boot/kernel-$version ;;
- i?86)
- cp System.map \
- $PKG/boot/System.map-$version
- cp .config \
- $PKG/boot/config-$version
- cp arch/i386/boot/bzImage \
- $PKG/boot/kernel-$version ;;
+ x86_64)
+ cp System.map \
+ $PKG/boot/System_64.map-$version
+ cp .config \
+ $PKG/boot/config_64-$version
+ cp arch/x86_64/boot/bzImage \
+ $PKG/boot/kernel-$version ;;
+ i?86)
+ cp System.map \
+ $PKG/boot/System.map-$version
+ cp .config \
+ $PKG/boot/config-$version
+ cp arch/i386/boot/bzImage \
+ $PKG/boot/kernel-$version ;;
esac
ln -sf kernel-$version $PKG/boot/kernel
cd $PKG/lib/modules/${_BaseVersion}/
@@ -88,7 +93,6 @@ mkdir $PKG/usr/src/linux-${_BaseVersion}/arch
mv $SRC/linux-${_BaseVersion}/arch/x86 $PKG/usr/src/linux-${_BaseVersion}/arch
mv $SRC/linux-${_BaseVersion}/vmlinux $PKG/usr/src/linux-${_BaseVersion}/
mv $SRC/linux-${_BaseVersion}/Module.symvers $PKG/usr/src/linux-${_BaseVersion}/
-rm -rf $PKG/lib/firmware
mkdir -p $PKG/root/bin
install -m755 $SRC/install-${SCRIPT_VERSION}.ash \
$PKG/root/bin/install-${SCRIPT_VERSION}.ash
diff --git a/base/kernel-precision-380/post-install b/base/kernel-precision-380/post-install
index bff83f2e2..30513e1dc 100644
--- a/base/kernel-precision-380/post-install
+++ b/base/kernel-precision-380/post-install
@@ -1,7 +1,7 @@
version=2.6.37
SCRIPT_VERSION="pakxe"
SRC=/tmp/work
-WDIR=$SRC/nutyx-initrd-pakxe
+WDIR=$SRC/nutyx-initrd
ARCH=`uname -m`
depmod $version
if [ ! -d $SRC ]; then
@@ -22,8 +22,10 @@ do
done
# Copie des modules kernels
mkdir -p $WDIR/rootfs/lib/modules/$version/kernel/{drivers,fs}
-cp -a /lib/modules/$version/kernel/crypto \
-$WDIR/rootfs/lib/modules/$version/kernel/
+if [ -f /lib/modules/$version/kernel/crypto ]; then
+ cp -a /lib/modules/$version/kernel/crypto \
+ $WDIR/rootfs/lib/modules/$version/kernel/
+fi
for i in ata block input ide hid message parport \
serial misc net pcmcia scsi usb md rtc
do
@@ -54,23 +56,23 @@ fi
cp /root/bin/install-${SCRIPT_VERSION}.ash $WDIR/rootfs/install/
# Compression des dossiers
-for i in etc sbin var lib usr
- do mksquashfs $WDIR/rootfs/$i $WDIR/rootfs/sqfs/$i
-done
-if [ "$ARCH" == "i686" ]; then
- mkdir $WDIR/rootfs/libT
- for i in libc.so.6 libc-2.13.so ld-2.13.so ld-linux.so.2
- do mv $WDIR/rootfs/lib{,T}/$i
- done
-fi
-for i in sbin var lib usr opt
- do rm -r $WDIR/rootfs/$i
- mkdir $WDIR/rootfs/$i
-done
-if [ "$ARCH" == "i686" ]; then
- rm -r $WDIR/rootfs/lib
- mv $WDIR/rootfs/lib{T,}
-fi
+# for i in etc sbin var lib usr
+# do mksquashfs $WDIR/rootfs/$i $WDIR/rootfs/sqfs/$i
+# done
+# if [ "$ARCH" == "i686" ]; then
+# mkdir $WDIR/rootfs/libT
+# for i in libc.so.6 libc-2.13.so ld-2.13.so ld-linux.so.2
+# do mv $WDIR/rootfs/lib{,T}/$i
+# done
+# fi
+# for i in sbin var lib usr opt
+# do rm -r $WDIR/rootfs/$i
+# mkdir $WDIR/rootfs/$i
+# done
+# if [ "$ARCH" == "i686" ]; then
+# rm -r $WDIR/rootfs/lib
+# mv $WDIR/rootfs/lib{T,}
+# fi
sh $WDIR/script/mkinitrd $WDIR
cp $WDIR/iso/isolinux/initrd /boot/nutyx-initrd
-rm -r $SRC
+# rm -r $SRC
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-11-28 21:09:26 +0000