diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index a097dd839..6af78053f 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -6,18 +6,18 @@ buildarch=2 pkgbase=linux-kirkwood _kernelname=${pkgbase#linux} _desc="Marvell Kirkwood" -pkgver=3.19 +pkgver=3.19.1 pkgrel=1 -cryptodev_commit=6aa62a2c320b04f55fdfe0ed015c3d9b48997239 +cryptodev_commit=5054d20d45571cc85339351fde52f872eeb82206 bfqver=v7r7 ### BFQ patch kernel version -#bfqkern=${pkgver:0:4} -bfqkern=3.18 +bfqkern=${pkgver:0:4} +#bfqkern=3.18 ### AUFS branch name -#aufsbranch="aufs${pkgver:0:4}" -aufsbranch="aufs3.x-rcN" +aufsbranch="aufs${pkgver:0:4}" +#aufsbranch="aufs3.x-rcN" arch=('arm') url="http://www.kernel.org/" @@ -33,23 +33,21 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz" '0001-disable-mv643xx_eth-TSO.patch' "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=${aufsbranch}" "cryptodev.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz" - 'cryptodev_3.19-fix.patch' "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch" "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch" "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch") -md5sums=('d3fc8316d4d4d04b65cbc2d70799e763' +md5sums=('90e9cdcaecf587acba4e94904f5f8606' '9536f8b79e105c48ec623a477ac1a6fb' 'b295fdc2d4be88e7516b60e58a6b5b25' 'df25fccf87d246f97dac2843e22debe6' '9b5a265440abf57d2052838f31486a3a' '09d44b9f07abfaeaf4f688ee52034786' 'SKIP' - 'ddf7876487c876f6676ef0e050e9d204' - '4fcbe246deb842c156307a4e111cad00' - '1c7c2d0338939a9e6953a64d80861471' - 'a81346cce95baeac2c56cf60d3c7e5b6' - '8f2743651280f5a022e541f4e95e5546') + '8f81b86fffb53ab49d1e48f86383deea' + 'b548a53e1c07209770dd1acb51dc1ae5' + '55446f2cfb5466d868088b6a938adf03' + 'dc11bd25031e98d003d8b027d79c812c') prepare() { cd "${srcdir}/linux-${pkgver}" @@ -81,11 +79,6 @@ msg2 "Add BFQ patches" patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch" patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch" -msg2 "Fix cryptodev for kernel >=3.19" - cd "${srcdir}/cryptodev-linux-${cryptodev_commit}" - patch -p1 -i "${srcdir}/cryptodev_3.19-fix.patch" - cd "${srcdir}/linux-${pkgver}" - cat "${srcdir}/config" > ./.config # add pkgrel to extraversion diff --git a/core/linux-kirkwood/cryptodev_3.19-fix.patch b/core/linux-kirkwood/cryptodev_3.19-fix.patch deleted file mode 100644 index 135551ab1..000000000 --- a/core/linux-kirkwood/cryptodev_3.19-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7d71124991030f99965e6e6aaed421115f185adb Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado -Date: Mon, 9 Feb 2015 13:51:56 +0100 -Subject: [PATCH] ioctl.c: Fix build on 3.19 - -get_unused_fd() MACRO has been removed on kernel 3.19. Replace by the -actual output of the macro. - -Signed-off-by: Ricardo Ribalda Delgado ---- - ioctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ioctl.c b/ioctl.c ---- a/ioctl.c -+++ b/ioctl.c -@@ -546,7 +546,7 @@ - clonefd(struct file *filp) - { - int ret; -- ret = get_unused_fd(); -+ ret = get_unused_fd_flags(0); - if (ret >= 0) { - get_file(filp); - fd_install(ret, filp); --- -2.1.4