From 51b824382624eca1db5f4c39ca899ab5d2fd0984 Mon Sep 17 00:00:00 2001
From: tnut <tnut at nutyx dot com>
Date: Sun, 14 Aug 2011 11:07:33 +0200
Subject: kernel, maj 2.6.39.4-1

---
 base/kernel/Pkgfile               | 16 ++++++++--------
 base/kernel/makefile_compat.patch | 10 ++++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 base/kernel/makefile_compat.patch

(limited to 'base')

diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile
index 408a49819..fbad4be53 100644
--- a/base/kernel/Pkgfile
+++ b/base/kernel/Pkgfile
@@ -4,9 +4,9 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=kernel
-version=2.6.39.3
+version=2.6.39.4
 _BaseVersion=2.6.39
-release=2
+release=1
 PKGMK_NO_STRIP="yes"
 PKGMK_IGNORE_FOOTPRINT="yes"
 PKGMK_IGNORE_MD5SUM="yes"
@@ -15,9 +15,9 @@ INITRDBASE="nutyx-initrd"
 _extra=30052011
 _tools=03072011
 NVIDIA_VERSION=280.13
-VB_VERSION=4.0.12
-VB_BUILD=72916
-ATI_VERSION=11.6
+VB_VERSION=4.1.0
+VB_BUILD=73009
+ATI_VERSION=11.7
 
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
@@ -29,7 +29,7 @@ source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_
 	http://www.broadcom.com/docs/linux_sta/5_100_82_38.patch \
 	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 \
+	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 \
@@ -101,8 +101,8 @@ cd $SRC
 sh ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract ati
 cd ati
 patch -Np1 -i ../makefile_compat.patch
-patch -Np1 -i ../2.6.39_bkl.patch
-patch -Np1 -i ../no_bkl.patch
+# 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/${_ARCH}/lib/modules/fglrx/build_mod/libfglrx_ip.a .
diff --git a/base/kernel/makefile_compat.patch b/base/kernel/makefile_compat.patch
new file mode 100644
index 000000000..defa3d8d8
--- /dev/null
+++ b/base/kernel/makefile_compat.patch
@@ -0,0 +1,10 @@
+--- 10.10/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-09-22 09:15:33.000000000 +0200
++++ 10.10/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-10-01 17:57:21.057820899 +0200
+@@ -66,6 +66,7 @@
+                 -DFGL_GART_RESERVED_SLOT \
+                 -DFGL_LINUX253P1_VMA_API \
+                 -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
++                -DCOMPAT_ALLOC_USER_SPACE=$(COMPAT_ALLOC_USER_SPACE) \
+ 
+ ifeq ($(KERNELRELEASE),)
+ # on first call from remote location we get into this path
-- 
cgit v1.2.3-70-g09d2