From 1355089c2951160a3b54384337b6d9cb505cac01 Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 9 Oct 2010 00:53:49 +0200 Subject: maj kernel#2.6.35.7-2 --- base/kernel/.footprint | 4 +++ base/kernel/Pkgfile | 18 ++++++++++-- base/kernel/post-install | 72 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 90 insertions(+), 4 deletions(-) (limited to 'base') diff --git a/base/kernel/.footprint b/base/kernel/.footprint index 5bb69ade1..79562f7a7 100644 --- a/base/kernel/.footprint +++ b/base/kernel/.footprint @@ -3,6 +3,7 @@ drwxr-xr-x root/root boot/ -rw-r--r-- root/root boot/config-2.6.35.7 lrwxrwxrwx root/root boot/kernel -> kernel-2.6.35.7 -rw-r--r-- root/root boot/kernel-2.6.35.7 +-rw-r--r-- root/root boot/nutyx-initrd.tar.xz drwxr-xr-x root/root lib/ drwxr-xr-x root/root lib/modules/ drwxr-xr-x root/root lib/modules/2.6.35-NuTyX/ @@ -2677,6 +2678,9 @@ drwxr-xr-x root/root lib/modules/2.6.35-NuTyX/kernel/sound/usb/usx2y/ -rw-r--r-- root/root lib/modules/2.6.35-NuTyX/modules.symbols.bin -rw-r--r-- root/root lib/modules/2.6.35-NuTyX/modules.usbmap lrwxrwxrwx root/root lib/modules/2.6.35-NuTyX/source -> /usr/src/linux-2.6.35 +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.35/ diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile index 227a85fed..c83b50ce9 100644 --- a/base/kernel/Pkgfile +++ b/base/kernel/Pkgfile @@ -3,13 +3,20 @@ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -name=kernel-35 +name=kernel version=2.6.35.7 _BaseVersion=2.6.35 -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 cd linux-${_BaseVersion} @@ -64,4 +71,9 @@ 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 -r $PKG/lib/firmware +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/post-install b/base/kernel/post-install index 26c8f3c78..a9433c1ce 100644 --- a/base/kernel/post-install +++ b/base/kernel/post-install @@ -1 +1,71 @@ -depmod 2.6.35-NuTyX +version=2.6.35-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 -- cgit v1.2.3-70-g09d2