core/linux-armv7 to 6.9.6-1

Tested on Wandboard i.MX6 Quad/no dmegs regressions

core/linux-armv7/PKGBUILD

@@ -4,13 +4,13 @@
 buildarch=4
 
 pkgbase=linux-armv7
-_srcname=linux-6.2
+_srcname=linux-6.9
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=6.2.10
+pkgver=6.9.6
 pkgrel=1
-rcnver=6.2.0
-rcnrel=multiv7-r0
+rcnver=6.9.0
+rcnrel=multiv7-r1
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -30,26 +30,22 @@ source=("https://www.kernel.org/pub/linux/kernel/v6.x/${_srcname}.tar.xz"
         'kernel.its'
         'kernel.keyblock'
         'kernel_data_key.vbprivk'
-        'linux.preset'
-        '60-linux.hook'
-        '90-linux.hook')
-md5sums=('787862593d7bf354cf1a5c37e21fc147'
-         'e0221ea0e6eeb147c29d2fd72e987ed5'
-         'f9c3afa39e6dec8bcdd68dd5667c06a6'
+        'linux.preset')
+md5sums=('b9828ed78dae306e3d90643cd5cdb8f1'
+         'f65db321ef86dcccf3d27d26023c6438'
+         '39c5b016f75c2e8ca64222eb16ad6c6e'
          '9e9d3b4cde2e27afd79f8818eb86a493'
          '46fd4237094df0d32e19ef797511195f'
          'bb32c18626916fba143461da3b6d3f7a'
          '8f18d1db15ced906458992ea5aafa79e'
-         '84b9e5ca6d5284561bcb4401d8cd693e'
-         '6226d24c61278a4b7835b0774a5d0149'
-         '30c239cd58141b8ae197b4d8efc5bdc7'
-         '2d776f9db9dcb7518f22e013ea994aaf'
+         '68e6db7ebf429d65e1696ad83bdcb329'
+         'e03a69d7b41ce58991c7cbaf5cfdaee3'
+         '30c879166a58eb98e7ce6a652427a4b1'
+         '72bd5152de62a8bf16804bf196a3e06b'
          '0963ff6490be16935370812fc75fa065'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
-         '86d4a35722b5410e3b29fc92dae15d4b'
-         'ce6c81ad1ad1f8b333fd6077d47abdaf'
-         '3e2a512f8da5db5fe9f17875405e56a3')
+         '86d4a35722b5410e3b29fc92dae15d4b')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
@@ -67,7 +63,10 @@ prepare() {
   git apply ../0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
   git apply ../0005-set-default-cubietruck-led-triggers.patch
   git apply ../0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
-  git apply ../0007-USB-Armory-MkII-support.patch
+
+  # TODO: fix MkII stuff currently ends in errors:
+  # make[4]: *** No rule to make target '/scratch/d/pkg/linux-armv7/boot/dtbs/imx6ul-512M-usbarmory.dts', needed by '__dtbs_install'.  Stop.
+  #git apply ../0007-USB-Armory-MkII-support.patch
 
   cat "${srcdir}/config" > ./.config
 
@@ -141,7 +140,7 @@ _package() {
     install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modules/${_extramodules}/version"
 
   # remove build and source links
-  rm "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build}
+  rm -f "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build}
 
   # now we call depmod...
   depmod -b "${pkgdir}/usr" -F System.map "${_kernver}"
@@ -157,11 +156,10 @@ _package() {
   sed "${_subst}" ../linux.preset |
     install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
 
-  # install pacman hooks
-  sed "${_subst}" ../60-linux.hook |
-    install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/60-${pkgbase}.hook"
-  sed "${_subst}" ../90-linux.hook |
-    install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook"
+  # rather than use another hook (90-linux.hook) rely on kmod's 90-mkinitcpio-install.hook
+  # which avoids a double run of mkinitcpio that can occur
+  install -d "${pkgdir}/usr/lib/firmware/"
+  touch "${pkgdir}/usr/lib/firmware/foo"
 }
 
 _package-headers() {