diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 96367fb49..5c167c108 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -10,7 +10,7 @@ pkgname=('linux' 'linux-headers') _kernelname=${pkgname#linux} _basekernel=3.1 pkgver=${_basekernel}.10 -pkgrel=27 +pkgrel=28 cryptover=1.6 bfqver=v6r2 uksmver=0.1.2.2 @@ -23,6 +23,7 @@ options=('!strip') source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2" "ftp://ftp.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.bz2" 'archlinuxarm.patch' + 'memset.patch' 'pciefix.patch' 'support.patch' 'aufs3-kbuild.patch' @@ -39,10 +40,10 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2 "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0003-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0004-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch" "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz") - md5sums=('8d43453f8159b2332ad410b19d86a931' 'a8e1c25a93a685ec2a1c3a808715fe9d' - '803ba585e7aa3c1b900fffe977e92fc1' + '3146a693d9225343de2a8dbeb0c8e841' + '39be2896f0b968d61a19b33da75ce6e0' '61dbbcdb0f35032ea7f82c5b1ef7c769' 'f5d3635da03cb45904bedd69b47133de' '3f64ed9d71499fe9293dc671f4e4087e' @@ -50,23 +51,26 @@ md5sums=('8d43453f8159b2332ad410b19d86a931' 'c9e6e8bb0774a89f7f9bd30a13be7532' '55b04499a4578e586cf5a4d0b69fc5aa' 'd0c9618f942ab76212c9434dc14ba9b3' - 'SKIP' + '84b2360d1fee9a97ab9e1fba1446b8c3' '9d3c56a4b999c8bfbd4018089a62f662' 'd00814b57448895e65fbbc800e8a58ba' - '19685c92623a8176fe3ed41d1ef8c5d9' + '19685c92623a8176fe3ed41d1ef8c5d9' '4b94c49eef0a3eaa8b208662d34a73f0' 'c194f165a59266e764683439a6068c66' 'efeb99dd8ff6f619ecc0e399deef833e' 'ea737ea7e9986ea3ba9325ba265055e4' 'eade38998313c25fd7934719cdf8a2ea') -build() { +prepare() { msg "Patches:" cd "${srcdir}/linux-${_basekernel}" msg2 "Add upstream patch" patch -p1 -i "${srcdir}/patch-${pkgver}" +msg2 "Fix memset for GCC 4.8" + patch -p1 -i "${srcdir}/memset.patch" + msg2 "Add the pci-e patch backported from 3.6.10 for kirkwoods" patch -Np1 -i "${srcdir}/pciefix.patch" @@ -105,11 +109,15 @@ msg2 "Set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) cat "${srcdir}/config" > ./.config - # set extraversion to pkgrel - sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + # add pkgrel to extraversion + sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh +} + +build() { + cd "${srcdir}/linux-${_basekernel}" # get kernel version make prepare