summaryrefslogtreecommitdiffstats
path: root/kernel/Pkgfile
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/Pkgfile')
-rw-r--r--kernel/Pkgfile57
1 files changed, 29 insertions, 28 deletions
diff --git a/kernel/Pkgfile b/kernel/Pkgfile
index d79340146..1145a214b 100644
--- a/kernel/Pkgfile
+++ b/kernel/Pkgfile
@@ -2,20 +2,21 @@
# 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
-# Depends on: git, prt-get
+# Depends on: git, prt-get, linux-firmware
+# Run on: linux-firmware
name=kernel
-version=3.5.0
+version=3.5.1
_BaseVersion=$(expr $version : '\([0-9]\.[0-9]\)')
-release=1
+release=2
PKGMK_NO_STRIP="yes"
PKGMK_IGNORE_FOOTPRINT="yes"
PKGMK_IGNORE_MD5SUM="yes"
SCRIPT_VERSION="pakxe.4"
INITRDBASE="nutyx-initrd"
_extra=08072012
-_tools=22072012
-NVIDIA_VERSION=304.32
+_tools=05082012
+NVIDIA_VERSION=304.37
VB_VERSION=4.1.18
VB_BUILD=78361
ATI_VERSION=12.6
@@ -35,12 +36,12 @@ source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_
http://kiao.no-ip.info/NuTyX/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
+ 0005-add-support-for-linux-3.4.0.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
+ compat_alloc-Makefile.patch
+ fglrx_kernel_3.4.0.patch
+ 3.5-do_mmap.patch
config_64
config)
@@ -53,13 +54,7 @@ build(){
sed -i "s/^SCRIPT_VERSION=.\{1,\}/SCRIPT_VERSION=\"$SCRIPT_VERSION\"/" `prt-get printf %p --filter=$name`/$name/post-install
# firmware
-#git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-#rm -r linux-firmware/.git
-
-#cp -a linux-firmware $INITRDBASE/rootfs/lib/firmware
-
-#mkdir -p $PKG/lib
-#cp -a linux-firmware $PKG/lib/firmware
+cp -a /lib/firmware $INITRDBASE/rootfs/lib/firmware
# initrd
cd $SRC
@@ -81,18 +76,20 @@ done
# kernel sources
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.xz ]; then
- xzcat $SRC/patch-$version.xz | patch -Np1
- fi
- cd ..
else
- rm -r linux-${_BaseVersion}
+ rm -rf linux-${_BaseVersion}
fi
ln -s /usr/src/linux-${_BaseVersion} linux-${_BaseVersion}
+
cd linux-${_BaseVersion}
+configVersion=`grep "Kernel Configuration" $SRC/config|cut -d " " -f3`
+
+if [ "$configVersion" != "$version" ]; then
+ if [ -f $SRC/patch-$version.xz ]; then
+ xzcat $SRC/patch-$version.xz | patch -Np1
+ fi
+fi
# make mrproper
case `uname -m` in
@@ -120,8 +117,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 -p1 < broadcom-wl-kernel3-01.patch
+patch -p2 < 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
@@ -138,9 +135,11 @@ install -m 0644 -D nvidia.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/nvi
cd $SRC
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
+
+patch -p0 < $SRC/compat_alloc-Makefile.patch
+patch -p0 < $SRC/fglrx_kernel_3.4.0.patch
+patch -p0 < $SRC/3.5-do_mmap.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 .
@@ -192,4 +191,6 @@ mkdir -p $PKG/root/bin
install -m755 $SRC/install-${SCRIPT_VERSION}.ash \
$PKG/root/bin/install-${SCRIPT_VERSION}.ash
bsdtar -c "-J" -f $PKG/boot/nutyx-initrd.tar.xz $INITRDBASE
+
+ rm -rf $PKG/lib/firmware
}