Bump linux-kirkwood to 3.5.4 and add BFQ support

This commit is contained in:
Joshua Coombs 2012-09-17 22:46:19 -04:00
parent 6be4ec7e0d
commit da2bac0919
3 changed files with 18 additions and 7 deletions

View file

@ -7,9 +7,9 @@ pkgbase=linux-kirkwood
pkgname=('linux-kirkwood' 'linux-headers-kirkwood') pkgname=('linux-kirkwood' 'linux-headers-kirkwood')
#pkgname=linux-test # Build kernel with a different name #pkgname=linux-test # Build kernel with a different name
_kernelname=${pkgname#linux} _kernelname=${pkgname#linux}
_basekernel=3.5.3 _basekernel=3.5.4
pkgver=${_basekernel} pkgver=${_basekernel}
pkgrel=1 pkgrel=0
cryptover=1.5 cryptover=1.5
arch=('arm') arch=('arm')
url="http://www.kernel.org/" url="http://www.kernel.org/"
@ -24,16 +24,20 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php' 'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
'change-default-console-loglevel.patch' 'change-default-console-loglevel.patch'
'usb-add-reset-resume-quirk-for-several-webcams.patch' 'usb-add-reset-resume-quirk-for-several-webcams.patch'
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz") "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
md5sums=('925bc1a6e2c98cb1e4d9ed8d30986dfb' "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.5.0-v4/0001-block-cgroups-kconfig-build-bits-for-BFQ-v4-3.5.patch"
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.5.0-v4/0002-block-introduce-the-BFQ-v4-I-O-sched-for-3.5.patch")
md5sums=('95d5c7271ad448bc965bdb29339b6923'
'468b0f29653a18d9debd17c99086dc4f' '468b0f29653a18d9debd17c99086dc4f'
'f5d3635da03cb45904bedd69b47133de' 'f5d3635da03cb45904bedd69b47133de'
'227356bd0efdc6b9a6925d46b3701141' '227356bd0efdc6b9a6925d46b3701141'
'd6ac249788b8fd06c71783464b6678b2' '9a4778bd910c788ff72d78066c41dc47'
'9506a43fff451fda36d5d7b1f5eaed04' '9506a43fff451fda36d5d7b1f5eaed04'
'9d3c56a4b999c8bfbd4018089a62f662' '9d3c56a4b999c8bfbd4018089a62f662'
'd00814b57448895e65fbbc800e8a58ba' 'd00814b57448895e65fbbc800e8a58ba'
'3a4b8d23c1708283e29477931d63ffb8') '3a4b8d23c1708283e29477931d63ffb8'
'5c0552440670dd3c41629346766cdb4a'
'da1584d485b4bc604d8208b50a6acf42')
build() { build() {
cd "${srcdir}/linux-${_basekernel}" cd "${srcdir}/linux-${_basekernel}"
@ -50,6 +54,10 @@ build() {
# Add AUFS3 patches # Add AUFS3 patches
patch -Np1 -i "${srcdir}/aufs3-3.5.patch" patch -Np1 -i "${srcdir}/aufs3-3.5.patch"
# Add BFQ patches
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v4-3.5.patch"
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v4-I-O-sched-for-3.5.patch"
# add latest fixes from stable queue, if needed # add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git

View file

@ -225,8 +225,11 @@ CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y CONFIG_IOSCHED_CFQ=y
# CONFIG_CFQ_GROUP_IOSCHED is not set # CONFIG_CFQ_GROUP_IOSCHED is not set
CONFIG_IOSCHED_BFQ=y
CONFIG_CGROUP_BFQIO=y
# CONFIG_DEFAULT_DEADLINE is not set # CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_CFQ=y CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_BFQ is not set
# CONFIG_DEFAULT_NOOP is not set # CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_DEFAULT_IOSCHED="cfq"
# CONFIG_INLINE_SPIN_TRYLOCK is not set # CONFIG_INLINE_SPIN_TRYLOCK is not set

View file

@ -2,7 +2,7 @@
# arg 2: the old package version # arg 2: the old package version
KERNEL_NAME=-kirkwood KERNEL_NAME=-kirkwood
KERNEL_VERSION=3.5.3-0-ARCH KERNEL_VERSION=3.5.4-0-ARCH
post_install () { post_install () {
# updating module dependencies # updating module dependencies