summaryrefslogtreecommitdiffstats
path: root/base/kernel-34
diff options
context:
space:
mode:
Diffstat (limited to 'base/kernel-34')
-rw-r--r--base/kernel-34/Pkgfile92
-rw-r--r--base/kernel-34/post-install62
2 files changed, 68 insertions, 86 deletions
diff --git a/base/kernel-34/Pkgfile b/base/kernel-34/Pkgfile
index e7697836e..a4e81ca7f 100644
--- a/base/kernel-34/Pkgfile
+++ b/base/kernel-34/Pkgfile
@@ -2,11 +2,10 @@
# URL: http://www.kernel.org
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-
-name=kernel-34
-version=2.6.34.9
+name=kernel
+version=2.6.34.10
_BaseVersion=2.6.34
-release=3
+release=1
PKGMK_NO_STRIP="yes"
PKGMK_IGNORE_FOOTPRINT="yes"
PKGMK_IGNORE_MD5SUM="yes"
@@ -15,16 +14,23 @@ INITRDBASE="nutyx-initrd"
_extra=30052011
_tools=25062011
NVIDIA_VERSION=275.09.07
+VB_VERSION=4.0.10
+VB_BUILD=72479
+ATI_VERSION=11.6
[ "`uname -m`" == "i686" ] && _ARCH=x86
[ "`uname -m`" == "x86_64" ] && _ARCH=x86_64
-source=(ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/$version/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\
- 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/longterm/v${_BaseVersion}/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)
+[ "`uname -m`" == "i686" ] && VB_ARCH=x86
+[ "`uname -m`" == "x86_64" ] && VB_ARCH=amd64
+source=(http://download.virtualbox.org/virtualbox/${VB_VERSION}/VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run \
+ http://www2.ati.com/drivers/linux/ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run \
+ http://nutyx.meticul.eu/files/patchs/ati/ati-${ATI_VERSION}.tar.gz \
+ ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\
+ 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/longterm/v${_BaseVersion}/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|" \
@@ -35,24 +41,33 @@ do
sed -i "s|#VERSION#|MINI $SCRIPT_VERSION|g" \
$INITRDBASE/rootfs/install/$i
done
+if ! [ -d /usr/src/linux-${_BaseVersion} ]; then
+ mv linux-${_BaseVersion} /usr/src/
+ ln -s /usr/src/linux-${_BaseVersion} linux-${_BaseVersion}
+ cd linux-${_BaseVersion}
+ if [ -f $SRC/patch-$version.bz2 ]; then
+ bzip2 -d -c $SRC/patch-$version.bz2 | patch -Np1
+ fi
+ cd ..
+else
+ rm -r linux-${_BaseVersion}
+fi
+ln -s /usr/src/linux-${_BaseVersion} linux-${_BaseVersion}
cd linux-${_BaseVersion}
-make mrproper
+# make mrproper
case `uname -m` in
x86_64)
mv $SRC/config_64 ./.config;;
i?86)
mv $SRC/config ./.config;;
esac
-if [ -f ../patch-$version.bz2 ]; then
- bzip2 -d -c ../patch-$version.bz2 | patch -Np1
-fi
sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
# make menuconfig
case `uname -m` in
x86_64)
- cp .config `prt-get printf %p --filter=$name`/$name/config_64;;
+ cp .config `prt-get printf %p --filter=$name`/$name/config_64;;
i?86)
- cp .config `prt-get printf %p --filter=$name`/$name/config;;
+ cp .config `prt-get printf %p --filter=$name`/$name/config;;
esac
make
case `uname -m` in
@@ -67,9 +82,35 @@ sh NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run --extract-only
cd NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}/kernel
ln -s Makefile{.kbuild,}
SYSSRC=$SRC/linux-${_BaseVersion} make module
-install -m 0644 -D nvidia.ko $PKG/lib/modules/${_BaseVersion}/kernel/video/nvidia/nvidia.ko
+install -m 0644 -D nvidia.ko $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/nvidia.ko
+
+# Module ati
+cd $SRC
+sh ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract ati
+cd ati
+patch -Np1 -i ../2.6.39_bkl.patch
+patch -Np1 -i ../no_bkl.patch
+cd common/lib/modules/fglrx/build_mod
+cp 2.6.x/Makefile .
+cp $SRC/ati/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a .
+make -C $SRC/linux-${_BaseVersion} SUBDIRS="`pwd`" modules
+install -m 0644 -D fglrx.ko $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/fglrx.ko
-# Modules install
+# Modules VB
+cd $SRC
+sh VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run --target vb --keep --noexec
+cd vb
+tar xfj VirtualBox.tar.bz2
+cd src/vboxhost/
+KERNELRELEASE=${_BaseVersion} KERN_DIR=$SRC/linux-${_BaseVersion} make
+for i in *.ko
+do
+ install -D -m0644 $i \
+ $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/$i
+done
+# Install modules
+cd $SRC/linux-${_BaseVersion}
+sed -i "/rm\ -rf\ \$(MODLIB)\/kernel/d" Makefile
make INSTALL_MOD_PATH=$PKG modules_install
mkdir -p $PKG/boot
case `uname -m` in
@@ -94,19 +135,6 @@ rm {build,source}
ln -sv /usr/src/linux-${_BaseVersion} build
ln -sv /usr/src/linux-${_BaseVersion} source
-mkdir -p $PKG/usr/src/linux-${_BaseVersion}/
-mv $SRC/linux-${_BaseVersion}/.config $PKG/usr/src/linux-${_BaseVersion}/
-mv $SRC/linux-${_BaseVersion}/Makefile $PKG/usr/src/linux-${_BaseVersion}/
-mkdir -p $PKG/usr/src/linux-${_BaseVersion}/kernel
-mv $SRC/linux-${_BaseVersion}/scripts $PKG/usr/src/linux-${_BaseVersion}/
-chmod og-w -R $PKG/usr/src/linux-${_BaseVersion}/scripts
-mv $SRC/linux-${_BaseVersion}/include $PKG/usr/src/linux-${_BaseVersion}/
-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}/
-
-
# initrd
cd $SRC
mkdir -p $PKG/root/bin
diff --git a/base/kernel-34/post-install b/base/kernel-34/post-install
index a8d7ae74f..d0ac1349d 100644
--- a/base/kernel-34/post-install
+++ b/base/kernel-34/post-install
@@ -20,62 +20,16 @@ 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/${version}/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/
+mkdir -p $WDIR/rootfs/lib/modules
+cp -a /lib/modules/${version}\
+$WDIR/rootfs/lib/modules/
-cp -a /lib/modules/${version}/modules* \
-$WDIR/rootfs/lib/modules/${version}/
+# Copie du script d'install
+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
+# Création de l'initrd
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-29 07:25:16 +0000