maj kernel-31#2.6.31.14-2

4 files changed, 91 insertions, 3 deletions

diff --git a/base/kernel-31/.footprint b/base/kernel-31/.footprint
index a08bf40ca..575bd299d 100644
--- a/base/kernel-31/.footprint
+++ b/base/kernel-31/.footprint
@@ -3,6 +3,7 @@ drwxr-xr-x	root/root	boot/
 -rw-r--r--	root/root	boot/config-2.6.31.14
 lrwxrwxrwx	root/root	boot/kernel -> kernel-2.6.31.14
 -rw-r--r--	root/root	boot/kernel-2.6.31.14
+-rw-r--r--	root/root	boot/nutyx-initrd.tar.xz
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/firmware/
 drwxr-xr-x	root/root	lib/firmware/3com/
@@ -2232,6 +2233,9 @@ drwxr-xr-x	root/root	lib/modules/2.6.31-NuTyX/kernel/sound/usb/usx2y/
 -rw-r--r--	root/root	lib/modules/2.6.31-NuTyX/modules.symbols.bin
 -rw-r--r--	root/root	lib/modules/2.6.31-NuTyX/modules.usbmap
 lrwxrwxrwx	root/root	lib/modules/2.6.31-NuTyX/source -> /usr/src/linux-2.6.31
+drwxr-xr-x	root/root	root/
+drwxr-xr-x	root/root	root/bin/
+-rw-r--r--	root/root	root/bin/install-attapu.ash
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/src/
 drwxr-xr-x	root/root	usr/src/linux-2.6.31/
diff --git a/base/kernel-31/.md5sum b/base/kernel-31/.md5sum
index 1284288a1..cf3359150 100644
--- a/base/kernel-31/.md5sum
+++ b/base/kernel-31/.md5sum
@@ -1,4 +1,7 @@
 e2a0fce3bad094a4b64764484528fc60  config
 38550ec26e5368286e2fde8fb03fa744  config_64
+2492f02b9f4a88d19bd6c208ce98330f  install-attapu.ash
+8ba54feb5e098b759d0306c29767a3a4  installtools-08102010.tar.gz
 84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
+087bd17651890c88a00df293cc24ca85  nutyx-initrd-extra-08102010.tar.bz2
 376a39c2b155cceeb85cbfba23b65345  patch-2.6.31.14.bz2
diff --git a/base/kernel-31/Pkgfile b/base/kernel-31/Pkgfile
index 7962a0947..517138038 100644
--- a/base/kernel-31/Pkgfile
+++ b/base/kernel-31/Pkgfile
@@ -6,10 +6,16 @@
 name=kernel-31
 version=2.6.31.14
 _BaseVersion=2.6.31
-release=1
+release=2
 PKGMK_NO_STRIP="yes"
+SCRIPT_VERSION="attapu"
+_extra=08102010
+_tools=08102010
 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://www.kernel.org/pub/linux/kernel/v2.6/patch-$version.bz2\
+	http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash\
+	http://nutyx.meticul.eu/files/nutyx-initrd-extra-${_extra}.tar.bz2\
+	http://nutyx.meticul.eu/files/installtools-${_tools}.tar.gz)
 
 build(){
 bzip2 -d patch-$version.bz2
@@ -62,4 +68,9 @@ 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}/
+mkdir -p $PKG/root/bin
+install -m644 $SRC/install-${SCRIPT_VERSION}.ash \
+	$PKG/root/bin/install-${SCRIPT_VERSION}.ash
+cd $SRC
+bsdtar -c "-J" -f $PKG/boot/nutyx-initrd.tar.xz nutyx-initrd-2009
 }
diff --git a/base/kernel-31/post-install b/base/kernel-31/post-install
index 9ed2b44d4..9be64ed06 100644
--- a/base/kernel-31/post-install
+++ b/base/kernel-31/post-install
@@ -1 +1,71 @@
-depmod 2.6.31-NuTyX
+version=2.6.31-NuTyX
+SCRIPT_VERSION="attapu"
+SRC=/tmp/work
+WDIR=$SRC/nutyx-initrd-2009
+depmod $version
+if [ ! -d $SRC ]; then 
+	mkdir -p $SRC
+fi
+tar -C $SRC -xf /boot/nutyx-initrd.* || exit 1
+cp /root/bin/install-${SCRIPT_VERSION}.ash \
+$WDIR/rootfs/install/
+for i in $WDIR/rootfs/install/setup-install \
+         $WDIR/rootfs/install/setup-mirroir
+do
+        sed -i "s|#INSTALL#|install-$SCRIPT_VERSION.ash|" $i || exit 1
+done
+
+for i in setup-grub functions setup-main main.txt
+do
+        sed -i "s|#VERSION#|$SCRIPT_VERSION|" $WDIR/rootfs/install/$i || exit 1
+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/
+for i in ata block input ide hid message parport \
+serial misc net pcmcia scsi usb md rtc
+do
+        if [ -d /lib/modules/$version/kernel/drivers/$i ]; then
+                cp -a /lib/modules/$version/kernel/drivers/$i \
+                $WDIR/rootfs/lib/modules/$version/kernel/drivers/
+        fi
+done
+for i in wireless irda wan bonding \
+hamradio appletalk cxgb3 mlx4 sfc
+do
+        rm -r $WDIR/rootfs/lib/modules/$version/kernel/drivers/net/$i
+done
+for i in fat ntfs smbfs vfat ext4 fs nfs nfs_common nfsd lockd
+do
+        if [ -d /lib/modules/$version/kernel/fs/$i ]; then
+                cp -a /lib/modules/$version/kernel/fs/$i \
+                $WDIR/rootfs/lib/modules/$version/kernel/fs/
+        fi
+done
+if [ -d /lib/modules/$version/kernel/net/sunrpc ]; then
+        mkdir -p $WDIR/rootfs/lib/modules/${_baseversion}-NuTyX/kernel/net/
+        cp -a /lib/modules/$version/kernel/net/sunrpc \
+        $WDIR/rootfs/lib/modules/$version/kernel/net/
+fi
+$WDIR/rootfs/sbin/depmod -b $WDIR/rootfs $version
+rm $WDIR/rootfs/sbin/depmod
+cp /root/bin/install-${SCRIPT_VERSION}.ash $WDIR/rootfs/install/
+
+# Compression des dossiers
+for i in sbin var lib usr opt etc
+        do mksquashfs $WDIR/rootfs/$i $WDIR/rootfs/sqfs/$i
+done
+mkdir $WDIR/rootfs/libT
+for i in libc.so.6 ld-linux.so.2
+        do mv $WDIR/rootfs/lib{,T}/$i
+done
+for i in sbin var lib usr opt
+        do rm -r $WDIR/rootfs/$i
+        mkdir $WDIR/rootfs/$i
+done
+rm -r $WDIR/rootfs/lib
+mv $WDIR/rootfs/lib{T,}
+sh $WDIR/script/mkinitrd $WDIR
+cp $WDIR/iso/isolinux/initrd /boot/nutyx-initrd
+rm -r $SRC