core/linux-kirkwood to 4.3.0-1

archlinuxarm · Nov 28, 2015 · 6022aff · 6022aff
1 parent 6696d24
commit 6022aff
Show file tree

Hide file tree

Showing 6 changed files with 234 additions and 206 deletions.
diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD
@@ -6,10 +6,10 @@ buildarch=2
 pkgbase=linux-kirkwood
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood"
-pkgver=4.2.6
+pkgver=4.3.0
 srcver=${pkgver%.0}
 pkgrel=1
-cryptodev_commit=da730106c2558c8e0c8e1b1b1812d32ef9574ab7
+cryptodev_commit=bc67142c57eadc0aafd0323ec527849012786643
 bfqver=v7r8
 
 ### BFQ patch kernel version
@@ -30,25 +30,25 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
         'archlinuxarm.patch'
         'config'
         'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
-        'usb-add-reset-resume-quirk-for-several-webcams.patch'
 	'0001-disable-mv643xx_eth-TSO.patch'
         "git+https://github.com/sfjro/aufs4-standalone.git#branch=${aufsbranch}"
         "cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
         "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")
+        "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch"
+        'linux.preset')
 
-md5sums=('209a610aec55df6ad0d3ceefc03a64f8'
-         '777d455648bd9d6017bc2620347596e8'
-         'e7a013ebbcc2a0665404d1e698547f80'
+md5sums=('58b35794eee3b6d52ce7be39357801e7'
+         'b91129f87c799e7184c00257eeddd2f2'
+         'cfae749ec27515f0f5b4bb3fc3b7e885'
          '5faf5d5f9aadf621942bd03c3b993947'
-         '9b5a265440abf57d2052838f31486a3a'
          '09d44b9f07abfaeaf4f688ee52034786'
          'SKIP'
-         '8fb4d3b7cc970351f3b5078b7893a107'
-         '82160f921c074b79a64a71b8d8945b06'
-         'd84e9d42dd3378d80af10120806609f7'
-         'b40833e6852e4c4c622836fe05dc6c71')
+         '2c8ecae91223868decdf37b8a76489b7'
+         'c075ad682894b99fcc0f8b5bdc5b8b1b'
+         '5d346d74dce5ea4aafc2af55bdf1e961'
+         '69e80fbf2e272c94fc10435ebb2dd022'
+         '6d8c200779cbdef582e9e435ed86ca31')
 
 prepare() {
   cd "${srcdir}/linux-${srcver}"
@@ -67,10 +67,6 @@ prepare() {
   msg2 "http://archlinuxarm.org/forum/viewtopic.php?f=9&t=7692"
   patch -Np1 -i ${srcdir}/0001-disable-mv643xx_eth-TSO.patch
 
-  msg2 "Add the USB_QUIRK_RESET_RESUME for several webcams"
-  # FS#26528
-  patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
-
   msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types"
   patch -Np1 -i "${srcdir}/archlinuxarm.patch"
   cp "${srcdir}/mach-types" arch/arm/tools
@@ -129,6 +125,7 @@ _package() {
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26' 'linux=${pkgver}' 'aufs_friendly' 'cryptodev_friendly')
   conflicts=('linux-kirkwood-dt' 'linux' 'linux-olinuxino')
+  backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=${pkgname}.install
 
   cd "${srcdir}/linux-${srcver}"
@@ -151,6 +148,13 @@ _package() {
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
     -i "${startdir}/${pkgname}.install"
 
+  # install mkinitcpio preset file for kernel
+  install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  sed \
+    -e "1s|'linux.*'|'${pkgbase}'|" \
+    -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
+    -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware