kernel 3.4.2-1 màj port

1 files changed, 25 insertions, 12 deletions

diff --git a/kernel/Pkgfile b/kernel/Pkgfile
index ddd3da99f..1ca2cafbc 100644
--- a/kernel/Pkgfile
+++ b/kernel/Pkgfile
@@ -2,10 +2,10 @@
 # URL:  http://www.kernel.org
 # Maintainer: git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
 # Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com
-#
+
 name=kernel
-version=3.3.2
-_BaseVersion=3.3
+version=3.4.2
+_BaseVersion=$(expr $version : '\([0-9]\.[0-9]\)')
 release=1
 PKGMK_NO_STRIP="yes"
 PKGMK_IGNORE_FOOTPRINT="yes"
@@ -14,10 +14,10 @@ SCRIPT_VERSION="pakxe.4"
 INITRDBASE="nutyx-initrd"
 _extra=11032012
 _tools=24042012
-NVIDIA_VERSION=295.40
-VB_VERSION=4.1.14
-VB_BUILD=77440
-ATI_VERSION=12.3
+NVIDIA_VERSION=302.11
+VB_VERSION=4.1.16
+VB_BUILD=78094
+ATI_VERSION=12.4
 
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
@@ -29,13 +29,23 @@ ATI_VERSION=12.3
 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/amd-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run
-	http://fr.download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run
-	http://www.kernel.org/pub/linux/kernel/v3.0/linux-${_BaseVersion}.tar.xz config_64 config
-	http://www.kernel.org/pub/linux/kernel/v3.0/patch-$version.xz
+	ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run
+	http://www.kernel.org/pub/linux/kernel/v3.0/linux-${_BaseVersion}.tar.xz
 	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
-	makefile_compat.patch bc_wl_abiupdate.patch ati-kernel-3.2.8.patch)
+	makefile_compat.patch
+	bc_wl_abiupdate.patch
+	ati-kernel-3.2.8.patch
+	ati-kernel-3.4.patch
+	broadcom-wl-kernel3-01.patch
+	0005-add-support-for-linux-3.4.0.patch
+	config_64
+	config)
+
+if [ "${version}" != "${_BaseVersion}.0" ]; then
+source[${#source[*]}]="http://www.kernel.org/pub/linux/kernel/v3.0/patch-$version.xz"
+fi
 
 build(){
 
@@ -72,7 +82,7 @@ if ! [ -d /usr/src/linux-${_BaseVersion} ]; then
         ln -s  /usr/src/linux-${_BaseVersion} linux-${_BaseVersion}
         cd linux-${_BaseVersion}
         if [ -f $SRC/patch-$version.xz ]; then
-		bzip2 -d -c  $SRC/patch-$version.xz | patch -Np1
+		xzcat $SRC/patch-$version.xz | patch -Np1
         fi
         cd ..
 else
@@ -108,6 +118,8 @@ case `uname -m` in
 esac
 # Module broadcom
 cd $SRC
+patch -Np1 -i broadcom-wl-kernel3-01.patch
+patch -Np2 -i 0005-add-support-for-linux-3.4.0.patch
 patch -p0 src/wl/sys/wl_linux.c < bc_wl_abiupdate.patch
 KBUILD_NOPEDANTIC=1 make -C $SRC/linux-${_BaseVersion} M=`pwd`
 install -m 0644 -D wl.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/wl.ko
@@ -126,6 +138,7 @@ sh amd-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract amd
 cd amd
 patch -Np1 -i ../makefile_compat.patch
 patch -Np1 -i ../ati-kernel-3.2.8.patch
+patch -Np1 -i ../ati-kernel-3.4.patch
 cd common/lib/modules/fglrx/build_mod
 cp 2.6.x/Makefile .
 cp $SRC/amd/arch/${_ARCH}/lib/modules/fglrx/build_mod/libfglrx_ip.a .