From 34d8c3d883edfa0a5ca2806b17c083bdfd9a10d9 Mon Sep 17 00:00:00 2001 From: moonman <moonman.ca@gmail.com> Date: Sat, 1 Nov 2014 22:29:49 +0000 Subject: [PATCH] core/linux-raspberrypi-latest to 3.17.2-1 --- ...or-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch | 38 ----------------- core/linux-raspberrypi-latest/PKGBUILD | 41 +++++++------------ 2 files changed, 14 insertions(+), 65 deletions(-) delete mode 100644 core/linux-raspberrypi-latest/0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch diff --git a/core/linux-raspberrypi-latest/0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch b/core/linux-raspberrypi-latest/0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch deleted file mode 100644 index 5b9effa57..000000000 --- a/core/linux-raspberrypi-latest/0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0daf37ef3f4ad76f3e56f888b48111c1b6c9119d Mon Sep 17 00:00:00 2001 -From: Arianna Avanzini <avanzini.arianna@gmail.com> -Date: Sun, 17 Aug 2014 07:07:24 -0500 -Subject: [PATCH] block: Switch from BFQ-v7r6 for 3.16.0 to BFQ-v7r6 for - 3.17.0-rc1 - ---- - block/bfq-cgroup.c | 2 +- - block/bfq.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c -index f742806..eb140eb 100644 ---- a/block/bfq-cgroup.c -+++ b/block/bfq-cgroup.c -@@ -871,7 +871,7 @@ struct cgroup_subsys bfqio_cgrp_subsys = { - .can_attach = bfqio_can_attach, - .attach = bfqio_attach, - .css_free = bfqio_destroy, -- .base_cftypes = bfqio_files, -+ .legacy_cftypes = bfqio_files, - }; - #else - static inline void bfq_init_entity(struct bfq_entity *entity, -diff --git a/block/bfq.h b/block/bfq.h -index ebbd040..34b37bf 100644 ---- a/block/bfq.h -+++ b/block/bfq.h -@@ -1,5 +1,5 @@ - /* -- * BFQ-v7r5 for 3.16.0: data structures and common functions prototypes. -+ * BFQ-v7r5 for 3.17.0-rc1: data structures and common functions prototypes. - * - * Based on ideas and code from CFQ: - * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk> --- -2.0.4 - diff --git a/core/linux-raspberrypi-latest/PKGBUILD b/core/linux-raspberrypi-latest/PKGBUILD index 05dbc9f41..d2fd3826e 100644 --- a/core/linux-raspberrypi-latest/PKGBUILD +++ b/core/linux-raspberrypi-latest/PKGBUILD @@ -5,13 +5,13 @@ buildarch=18 pkgbase=linux-raspberrypi-latest -_commit=58eb5023f30411060f3e905df7b91f3efe9c437c +_commit=1f6cd09d340c84759c73844bee78d2e177b9ab17 _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="Raspberry Pi" -pkgver=3.17.1 -pkgrel=3 -bfqver=v7r5 +pkgver=3.17.2 +pkgrel=1 +bfqver=v7r6 arch=('arm armv6h') url="http://www.kernel.org/" @@ -25,26 +25,19 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz" 'imagetool-uncompressed.py' # "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN" "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}" -# "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch" -# "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" -# "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch") -########REMOVE WHEN BFQ for 3.17 is released - "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.16.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-3.16.patch" - "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.16.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-3.16.patch" - "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.16.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-3.16.0.patch" - '0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch') -#######EVOMER########## + "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch" + "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" + "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch") -md5sums=('4052cef8799c86cd570bb182d14bd031' +md5sums=('043c297b15b287dd8354327da22e7749' 'b2ffc8ff27eb8c01c047f4a6cb2096a6' '9335d1263fd426215db69841a380ea26' 'a00e424e2fbb8c5a5f77ba2c4871bed4' '2f82dbe5752af65ff409d737caf11954' 'SKIP' - '27b45e15c3f9855792808498af21f664' - '812c18775a53e337f1b2c7cd9078bff1' - 'e903ed2c79546d2f0ec41e7e631c62f7' - '90a1fe58e60b17e0e5647a38776e8f43') + '065dfb596e42d2c92a34936ae9e718cd' + 'f5523479e045810acd2baf05f12f7b2c' + '0202585b76071b7ca1263515e2b4f23b') prepare() { cd "${srcdir}/${_srcname}" @@ -66,15 +59,9 @@ msg "Patches:" patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch msg2 "Add BFQ patches" -# patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch" -# patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" -# patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch" -##REMOVE WHEN BFQ for 3.17 is out - patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-3.16.patch" - patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-3.16.patch" - patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-3.16.0.patch" - patch -Np1 -i "${srcdir}/0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch" -##EVOMER### + patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch" + patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch" + patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch" msg "Prepare to build" cat "${srcdir}/config" > ./.config