diff --git a/core/linux-armv7/0007-USB-Armory-MkII-support.patch b/core/linux-armv7/0007-USB-Armory-MkII-support.patch index 04e0d674a..a8813dafe 100644 --- a/core/linux-armv7/0007-USB-Armory-MkII-support.patch +++ b/core/linux-armv7/0007-USB-Armory-MkII-support.patch @@ -12,7 +12,7 @@ Subject: [PATCH 7/7] USB Armory MkII support create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-usbarmory.dts diff --git a/arch/arm/boot/dts/nxp/imx/Makefile b/arch/arm/boot/dts/nxp/imx/Makefile -index 4052cad859fa..2c6d17819c76 100644 +index 231c0d7..dfdf19e 100644 --- a/arch/arm/boot/dts/nxp/imx/Makefile +++ b/arch/arm/boot/dts/nxp/imx/Makefile @@ -323,6 +323,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ @@ -23,10 +23,10 @@ index 4052cad859fa..2c6d17819c76 100644 imx6ull-14x14-evk.dtb \ imx6ull-colibri-aster.dtb \ imx6ull-colibri-emmc-aster.dtb \ -@@ -355,6 +356,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ - imx6ull-tarragon-slavext.dtb \ +@@ -358,6 +359,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ull-tqma6ull2-mba6ulx.dtb \ imx6ull-tqma6ull2l-mba6ulx.dtb \ + imx6ull-uti260b.dtb \ + imx6ull-usbarmory.dtb \ imx6ulz-14x14-evk.dtb \ imx6ulz-bsh-smm-m2.dtb diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index d4630525a..763ba2ade 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -4,12 +4,12 @@ buildarch=4 pkgbase=linux-armv7 -_srcname=linux-6.9 +_srcname=linux-6.10 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" -pkgver=6.9.12 -pkgrel=2 -rcnver=6.9.0 +pkgver=6.10.3 +pkgrel=1 +rcnver=6.10.0 rcnrel=multiv7-r1 arch=('armv7h') url="http://www.kernel.org/" @@ -31,17 +31,17 @@ source=("https://www.kernel.org/pub/linux/kernel/v6.x/${_srcname}.tar.xz" 'kernel.keyblock' 'kernel_data_key.vbprivk' 'linux.preset') -md5sums=('b9828ed78dae306e3d90643cd5cdb8f1' - 'f2d395bdb12bb02ffd3289b65db0e01a' - '39c5b016f75c2e8ca64222eb16ad6c6e' +md5sums=('c0ce046a9a0d041e13cf222f81eae574' + '16d906525dbe5888ee26c1364564ad8c' + '950125651d66860df3572d34c66b5d79' '30fc57b96c9ac83f0a0abef8b4552ffa' '5bf1ae1dec17213bb477c0578925391d' 'a8ad6d64dd9a8fd59529f6a751987d30' '2d48051202f6123a1b0c442230d60120' '8cd31506d15134f0165927f03bfc23f0' '8cc8dce375aff1e9d9a9907fc40a4196' - '901842d79326725dee2381a8f0b375d9' - 'c274675245cce72d30b5c935b5798534' + '5a761027013d2c0933ec81f6d09c77f8' + '5b9621c1d55d79d61ed74937ad4468db' '2d6094def20fc719ea4c36624eb91c39' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' @@ -79,6 +79,7 @@ build() { # get kernel version make prepare + make -s kernelrelease > version # load configuration # Configure the kernel. Replace the line below with one of your choice. @@ -156,10 +157,10 @@ _package() { sed "${_subst}" ../linux.preset | install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - # rather than use another hook (90-linux.hook) rely on kmod's 90-mkinitcpio-install.hook + # rather than use another hook (90-linux.hook) rely on mkinitcpio'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" + install -d "${pkgdir}/usr/lib/initcpio/" + echo "dummy file to trigger mkinitcpio to run" > "${pkgdir}/usr/lib/initcpio/$(