From 5a0a30445149bcf8baa646f19d528ea7f75e38ef Mon Sep 17 00:00:00 2001 From: moonman Date: Mon, 11 Feb 2013 16:55:48 -0700 Subject: [PATCH] Update core/linux-kirkwood to 3.7.7 --- core/linux-kirkwood/PKGBUILD | 19 ++++++++------- core/linux-kirkwood/mach-types | 43 ++++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index 19b3e42b5..206d1bbdd 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -7,10 +7,11 @@ pkgbase=linux-kirkwood pkgname=('linux-kirkwood' 'linux-headers-kirkwood') #pkgname=linux-test # Build kernel with a different name _kernelname=${pkgname#linux} -_basekernel=3.7.6 +_basekernel=3.7.7 pkgver=${_basekernel} pkgrel=0 cryptover=1.5 +bfqver=v6 arch=('arm') url="http://www.kernel.org/" license=('GPL2') @@ -24,19 +25,19 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2 'change-default-console-loglevel.patch' 'usb-add-reset-resume-quirk-for-several-webcams.patch' "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz" - "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch" - "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.7.0-v5r1/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch" + "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch" + "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch" 'aufs3-3.7.patch.xz') -md5sums=('946c93d129f3aa19989c0b249a2473ef' +md5sums=('ec975c6ae50174f010c2a47eef890cd0' '17c0496b7f3031c864f49894702b8911' 'f5d3635da03cb45904bedd69b47133de' 'e828496b341896867da91386cc27df66' - '1f8103abb9c79b0745926acddec6ec85' + '96fc4f78d37d8f824401b2ca66a5dc0a' '9d3c56a4b999c8bfbd4018089a62f662' 'd00814b57448895e65fbbc800e8a58ba' '3a4b8d23c1708283e29477931d63ffb8' - '9daa5f662145f91b25b91b9fbeb874d9' - 'c80954ae588d8c168a0b1ae9ffe84c0e' + 'fc5936d5966359fcc40e175916e6c65f' + '9d1c42c395ed5a81a79222a808366687' '961e19a119443158f104a68ea4d0d9f1') build() { @@ -57,8 +58,8 @@ msg2 "Add AUFS3 patches" patch -Np1 -i "${srcdir}/aufs3-3.7.patch" msg2 "Add BFQ patches" - patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-v5r1-3.7.patch" - patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-v5r1-I-O-sched-for-3.7.patch" + patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch" + patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/core/linux-kirkwood/mach-types b/core/linux-kirkwood/mach-types index 8ba3ee723..d22361c8e 100644 --- a/core/linux-kirkwood/mach-types +++ b/core/linux-kirkwood/mach-types @@ -12,7 +12,7 @@ # # http://www.arm.linux.org.uk/developer/machines/?action=new # -# Last update: Tue Jan 15 01:20:54 2013 +# Last update: Mon Feb 11 23:53:10 2013 # # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number # @@ -4418,9 +4418,9 @@ epc35 MACH_EPC35 EPC35 4463 smartrtu MACH_SMARTRTU SMARTRTU 4464 rcm101 MACH_RCM101 RCM101 4465 amx_imx53_mxx MACH_AMX_IMX53_MXX AMX_IMX53_MXX 4466 -cp3dcg MACH_CP3DCG CP3DCG 4467 -cp3dtg MACH_CP3DTG CP3DTG 4468 -cp3dug MACH_CP3DUG CP3DUG 4469 +crius MACH_CP3DCG CP3DCG 4467 +themis MACH_CP3DTG CP3DTG 4468 +uranus MACH_CP3DUG CP3DUG 4469 acer_a12 MACH_ACER_A12 ACER_A12 4470 sbc6x MACH_SBC6X SBC6X 4471 u2 MACH_U2 U2 4472 @@ -4448,6 +4448,39 @@ colibri_t30 MACH_COLIBRI_T30 COLIBRI_T30 4493 cwv1 MACH_CWV1 CWV1 4494 nsa325 MACH_NSA325 NSA325 4495 dlxp_ul MACH_DLXP_UL DLXP_UL 4496 -imx233_dpxmtc MACH_DPXMTC DPXMTC 4497 +dpxmtc MACH_DPXMTC DPXMTC 4497 tt_stuttgart MACH_TT_STUTTGART TT_STUTTGART 4498 miranda_apcii MACH_MIRANDA_APCII MIRANDA_APCII 4499 +mx6q_moderox MACH_MX6Q_MODEROX MX6Q_MODEROX 4500 +mudskipper MACH_MUDSKIPPER MUDSKIPPER 4501 +urania MACH_URANIA URANIA 4502 +stm_b2112 MACH_STM_B2112 STM_B2112 4503 +gtou MACH_GTOU GTOU 4504 +mx6q_ats_phoenix MACH_MX6Q_ATS_PHOENIX MX6Q_ATS_PHOENIX 4505 +stm_b2116 MACH_STM_B2116 STM_B2116 4506 +mythology MACH_MYTHOLOGY MYTHOLOGY 4507 +fc360v1 MACH_FC360V1 FC360V1 4508 +gps_sensor MACH_GPS_SENSOR GPS_SENSOR 4509 +gazelle MACH_GAZELLE GAZELLE 4510 +mpq8064_dma MACH_MPQ8064_DMA MPQ8064_DMA 4511 +wems_asd01 MACH_WEMS_ASD01 WEMS_ASD01 4512 +apalis_t30 MACH_APALIS_T30 APALIS_T30 4513 +mx6q_sbc35_c398 MACH_MX6Q_QSBC35_C398 MX6Q_QSBC35_C398 4514 +armstonea9 MACH_ARMSTONEA9 ARMSTONEA9 4515 +omap_blazetablet MACH_OMAP_BLAZETABLET OMAP_BLAZETABLET 4516 +ar6mxq MACH_AR6MXQ AR6MXQ 4517 +ar6mxs MACH_AR6MXS AR6MXS 4518 +deto_mx6apos MACH_DETO_APOS_MX6 DETO_APOS_MX6 4519 +gwventana MACH_GWVENTANA GWVENTANA 4520 +igep0033 MACH_IGEP0033 IGEP0033 4521 +raca MACH_RACA RACA 4522 +applesoda MACH_APPLESODA APPLESODA 4523 +h52c1_concerto MACH_H52C1_CONCERTO H52C1_CONCERTO 4524 +fcmbrd MACH_FCMBRD FCMBRD 4525 +pcaaxs1 MACH_PCAAXS1 PCAAXS1 4526 +ls_orca MACH_LS_ORCA LS_ORCA 4527 +pcm051lb MACH_PCM051LB PCM051LB 4528 +mx6s_lp507_gvci MACH_MX6S_LP507_GVCI MX6S_LP507_GVCI 4529 +dido MACH_DIDO DIDO 4530 +swarco_itc3_9g20 MACH_SWARCO_ITC3_9G20 SWARCO_ITC3_9G20 4531 +robo_roady MACH_ROBO_ROADY ROBO_ROADY 4532