kernel, maj 3.1.3-1

1 files changed, 19 insertions, 20 deletions

diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile
index e2367bfc7..fc79931fd 100644
--- a/base/kernel/Pkgfile
+++ b/base/kernel/Pkgfile
@@ -1,12 +1,12 @@
 # Description: Le kernel avec les modules nvidia, ati, broadcom et virtualbox
 # URL:  http://www.kernel.org
 # Maintainer: NuTyX core team
-# Packager: thierryn1 at hispeed dot ch
+# Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com
 
 name=kernel
-version=2.6.39.4
-_BaseVersion=2.6.39
-release=5
+version=3.1.3
+_BaseVersion=3.1
+release=1
 PKGMK_NO_STRIP="yes"
 PKGMK_IGNORE_FOOTPRINT="yes"
 PKGMK_IGNORE_MD5SUM="yes"
@@ -14,10 +14,10 @@ SCRIPT_VERSION="pakxe.3"
 INITRDBASE="nutyx-initrd"
 _extra=30052011
 _tools=08112011
-NVIDIA_VERSION=285.05.09
+NVIDIA_VERSION=290.10
 VB_VERSION=4.1.6
-VB_BUILD=74713
-ATI_VERSION=11.9
+VB_BUILD=74727
+ATI_VERSION=11.11
 
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
@@ -25,19 +25,18 @@ ATI_VERSION=11.9
 [ "`uname -m`" == "x86_64"   ] && VB_ARCH=amd64
 [ "`uname -m`" == "i686"   ] && BC_ARCH=x86_32
 [ "`uname -m`" == "x86_64"   ] && BC_ARCH=x86_64
-source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_82_38.tar.gz \
-	http://www.broadcom.com/docs/linux_sta/5_100_82_38.patch \
+source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_82_112.tar.gz \
 	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 \
 	makefile_compat.patch \
 	http://fr.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/patch-$version.bz2 \
+	http://www.kernel.org/pub/linux/kernel/v3.0/linux-${_BaseVersion}.tar.bz2 config_64 config\
+	http://www.kernel.org/pub/linux/kernel/v3.0/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
+# unset MAKEFLAGS
 for i in setup-install setup-mirroir
 do
         sed -i "s|#INSTALL#|install-$SCRIPT_VERSION.ash|" \
@@ -85,16 +84,16 @@ case `uname -m` in
 esac
 # Module broadcom
 cd $SRC
-patch -Np0 -i 5_100_82_38.patch
+# patch -Np0 -i 5_100_82_38.patch
 KBUILD_NOPEDANTIC=1 make -C $SRC/linux-${_BaseVersion} M=`pwd`
-install -m 0644 -D wl.ko $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/wl.ko
+install -m 0644 -D wl.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/wl.ko
 # Module nvidia
 cd $SRC
 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/drivers/zzzz/nvidia.ko
+install -m 0644 -D nvidia.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/nvidia.ko
 
 # Module ati
 cd $SRC
@@ -107,7 +106,7 @@ cd common/lib/modules/fglrx/build_mod
 cp 2.6.x/Makefile .
 cp $SRC/ati/arch/${_ARCH}/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
+install -m 0644 -D fglrx.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/fglrx.ko
 
 # Modules VB
 cd $SRC
@@ -115,16 +114,16 @@ sh VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run --target vb --keep
 cd vb
 tar xfj VirtualBox.tar.bz2
 cd src/vboxhost/
-KERNELRELEASE=${_BaseVersion} KERN_DIR=$SRC/linux-${_BaseVersion} make
+KERNELRELEASE=${version} KERN_DIR=$SRC/linux-${_BaseVersion} make
 for i in *.ko
 do
         install -D -m0644 $i \
-        $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/$i
+        $PKG/lib/modules/${version}/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
+make -j1 INSTALL_MOD_PATH=$PKG modules_install
 mkdir -p $PKG/boot
 case `uname -m` in
         x86_64)
@@ -143,7 +142,7 @@ case `uname -m` in
                 $PKG/boot/kernel-$version ;;
 esac
 ln -sf kernel-$version $PKG/boot/kernel
-cd $PKG/lib/modules/${_BaseVersion}/
+cd $PKG/lib/modules/${version}/
 rm {build,source}
 ln -sv /usr/src/linux-${_BaseVersion} build
 ln -sv /usr/src/linux-${_BaseVersion} source