diff options
| -rw-r--r-- | base/kernel-36/Pkgfile | 16 | ||||
| -rw-r--r-- | base/kernel-36/post-install | 27 |
2 files changed, 24 insertions, 19 deletions
diff --git a/base/kernel-36/Pkgfile b/base/kernel-36/Pkgfile index 77bd21ca4..10a493860 100644 --- a/base/kernel-36/Pkgfile +++ b/base/kernel-36/Pkgfile @@ -8,26 +8,26 @@ version=2.6.36.2 _BaseVersion=2.6.36 release=4 PKGMK_NO_STRIP="yes" -SCRIPT_VERSION="attapu.1" -_extra=31102010 -_tools=11122010 +SCRIPT_VERSION="pakxe" +_extra=02012011 +_tools=02012011 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\ - http://nutyx.meticul.eu/files/nutyx-initrd-extra-${_extra}.tar.bz2\ - http://nutyx.meticul.eu/files/installtools-${_tools}.tar.gz) + http://nutyx.meticul.eu/files/nutyx-initrd-`uname -m`-${_extra}.tar.bz2\ + http://nutyx.meticul.eu/files/installtools-${_tools}.tar.bz2) build(){ unset MAKEFLAGS for i in setup-install setup-mirroir do sed -i "s|#INSTALL#|install-$SCRIPT_VERSION.ash|" \ - nutyx-initrd-2009/rootfs/install/$i || exit 1 + nutyx-initrd-2011/rootfs/install/$i || exit 1 done for i in main.txt functions setup-grub setup-grub do sed -i "s|#VERSION#|MINI $SCRIPT_VERSION|g" \ - nutyx-initrd-2009/rootfs/install/$i + nutyx-initrd-2011/rootfs/install/$i done cd linux-${_BaseVersion} @@ -86,5 +86,5 @@ mkdir -p $PKG/root/bin install -m755 $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 +bsdtar -c "-J" -f $PKG/boot/nutyx-initrd.tar.xz nutyx-initrd-2011 } diff --git a/base/kernel-36/post-install b/base/kernel-36/post-install index 03344d9a1..129e5720d 100644 --- a/base/kernel-36/post-install +++ b/base/kernel-36/post-install @@ -1,7 +1,8 @@ version=2.6.36-NuTyX -SCRIPT_VERSION="attapu.1" +SCRIPT_VERSION="pakxe" SRC=/tmp/work -WDIR=$SRC/nutyx-initrd-2009 +WDIR=$SRC/nutyx-initrd-2011 +ARCH=`uname -m` depmod $version if [ ! -d $SRC ]; then mkdir -p $SRC @@ -34,7 +35,9 @@ 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 + if [ -d $WDIR/rootfs/lib/modules/$version/kernel/drivers/net/$i ]; then + rm -r $WDIR/rootfs/lib/modules/$version/kernel/drivers/net/$i + fi done for i in fat ntfs smbfs vfat ext4 fs nfs nfs_common nfsd lockd do @@ -48,24 +51,26 @@ if [ -d /lib/modules/$version/kernel/net/sunrpc ]; then 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 +if [ "$ARCH" == "i686" ]; then + mkdir $WDIR/rootfs/libT + for i in libc.so.6 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 -rm -r $WDIR/rootfs/lib -mv $WDIR/rootfs/lib{T,} +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 |