From 4d3c250961227a2fb1644ea74a89570e35e78132 Mon Sep 17 00:00:00 2001 From: tnut Date: Fri, 22 Apr 2011 08:34:33 +0200 Subject: kernel, maj 2.6.38.4-1 --- base/kernel/Pkgfile | 29 ++++++++++++++++-- base/kernel/config | 3 +- base/kernel/config_64 | 5 ++-- base/kernel/post-install | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 base/kernel/post-install (limited to 'base/kernel') diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile index a4c5c04bf..158344977 100644 --- a/base/kernel/Pkgfile +++ b/base/kernel/Pkgfile @@ -4,15 +4,33 @@ # Packager: thierryn1 at hispeed dot ch name=kernel -version=2.6.38.2 +version=2.6.38.4 _BaseVersion=2.6.38 release=1 +PKGMK_NO_STRIP="yes" PKGMK_IGNORE_FOOTPRINT="yes" PKGMK_IGNORE_MD5SUM="yes" +SCRIPT_VERSION="pakxe" +INITRDBASE="nutyx-initrd" +_extra=22042011 +_tools=22042011 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-`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|" \ + $INITRDBASE/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" \ + $INITRDBASE/rootfs/install/$i +done cd linux-${_BaseVersion} make mrproper case `uname -m` in @@ -25,7 +43,7 @@ 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;; @@ -74,5 +92,10 @@ 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 -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 $INITRDBASE } diff --git a/base/kernel/config b/base/kernel/config index c82e8c779..d17cda7f7 100644 --- a/base/kernel/config +++ b/base/kernel/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.38 Kernel Configuration -# Thu Mar 31 15:50:01 2011 +# Fri Apr 22 08:32:15 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4648,6 +4648,7 @@ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_TEST_KSTRTOX is not set # CONFIG_STRICT_DEVMEM is not set CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y diff --git a/base/kernel/config_64 b/base/kernel/config_64 index b9cee30d1..fa7a2ab42 100644 --- a/base/kernel/config_64 +++ b/base/kernel/config_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.38 Kernel Configuration -# Thu Mar 31 14:46:22 2011 +# Fri Apr 22 03:51:42 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4575,6 +4575,7 @@ CONFIG_PROVIDE_OHCI1394_DMA_INIT=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y +# CONFIG_TEST_KSTRTOX is not set # CONFIG_STRICT_DEVMEM is not set CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y @@ -4708,7 +4709,7 @@ CONFIG_CRYPTO_VMAC=m # Digest # CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_CRC32C_INTEL is not set +CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y diff --git a/base/kernel/post-install b/base/kernel/post-install new file mode 100644 index 000000000..d318acef3 --- /dev/null +++ b/base/kernel/post-install @@ -0,0 +1,78 @@ +version=2.6.38 +SCRIPT_VERSION="pakxe" +SRC=/tmp/work +WDIR=$SRC/nutyx-initrd +ARCH=`uname -m` +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} +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 + 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 + 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 + 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 +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 +sh $WDIR/script/mkinitrd $WDIR +cp $WDIR/iso/isolinux/initrd /boot/nutyx-initrd +# rm -r $SRC -- cgit v1.2.3-70-g09d2