diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD index c88a34b86..ff1d530f0 100644 --- a/core/linux-raspberrypi/PKGBUILD +++ b/core/linux-raspberrypi/PKGBUILD @@ -7,12 +7,12 @@ buildarch=20 pkgbase=linux-raspberrypi -_commit=b188bacd71de1cd1a80f939ff65b82e9a805d272 +_commit=8362c08dfc8dd9e54745b3f1e5e4ff0a1fb30614 _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="Raspberry Pi" -pkgver=3.18.10 -pkgrel=3 +pkgver=3.18.11 +pkgrel=1 bfqver=v7r7 arch=('armv6h' 'armv7h') url="http://www.kernel.org/" @@ -26,18 +26,16 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz" "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch" 'https://github.com/raspberrypi/tools/raw/master/mkimage/mkknlimg' - 'aufs-fix.patch' 'config.txt' 'cmdline.txt' 'config.v6' 'config.v7') -md5sums=('433725a2c2a8dcfee1ec8678ae286a0c' +md5sums=('5aa4a4bdc4c9f0f9750be9538dc31d30' 'SKIP' '1c7c2d0338939a9e6953a64d80861471' 'a81346cce95baeac2c56cf60d3c7e5b6' '8f2743651280f5a022e541f4e95e5546' '69d50a4604a587ae770e4be244e293bd' - '305ee224eb761a7aeacc3dae6ad1987b' '02bdc293e3fefe067a0aae2635c3220b' '60bc3624123c183305677097bcd56212' 'acfc869522fd9078a4e1e471183a4391' @@ -56,7 +54,6 @@ prepare() { patch -Np1 -i ../aufs3-standalone/aufs3-base.patch patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch - patch -Np1 -i ../aufs-fix.patch msg2 "Add BFQ patches" patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch" diff --git a/core/linux-raspberrypi/aufs-fix.patch b/core/linux-raspberrypi/aufs-fix.patch deleted file mode 100644 index f71372ec4..000000000 --- a/core/linux-raspberrypi/aufs-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/fs/aufs/super.c b/fs/aufs/super.c -index a069370..9c5d95a 100644 ---- a/fs/aufs/super.c -+++ b/fs/aufs/super.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include "aufs.h" - - /*