core/mkinitcpio to 31-2.1

closes #1904

core/mkinitcpio/0001-use-gzip-for-compression-by-default.patch

@@ -1,7 +1,7 @@
 From f2be6a291b3a82754af1921d82ca56207fbb8ef6 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 20 Feb 2021 10:02:34 -0700
-Subject: [PATCH] use gzip for compression by default
+Subject: [PATCH 1/2] use gzip for compression by default
 
 ---
  man/mkinitcpio.conf.5.txt | 2 +-
@@ -49,5 +49,5 @@ index 3494fab..3c902f6 100644
  #COMPRESSION="zstd"
  #COMPRESSION="gzip"
 -- 
-2.33.0
+2.35.1
 

core/mkinitcpio/0002-functions-handle-gzip-compressed-kernels-in-kver_gen.patch

@@ -0,0 +1,29 @@
+From 65887576ad60bb29783a294b3ab09f87e345912e Mon Sep 17 00:00:00 2001
+From: Janne Grunau <j@jannau.net>
+Date: Sun, 30 Jan 2022 10:01:43 +0000
+Subject: [PATCH 2/2] functions: handle gzip compressed kernels in kver_generic
+
+Signed-off-by: Janne Grunau <j@jannau.net>
+---
+ functions | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/functions b/functions
+index 48cfd7a..e90c743 100644
+--- a/functions
++++ b/functions
+@@ -160,6 +160,11 @@ kver_generic() {
+ 
+     read _ _ kver _ < <(grep -m1 -aoE 'Linux version .(\.[-[:alnum:]]+)+' "$1")
+ 
++    # try if the image is gzip compressed
++    if [[ -z "$kver" ]]; then
++        read _ _ kver _ < <(gzip -c -d "$1" | grep -m1 -aoE 'Linux version .(\.[-[:alnum:]]+)+')
++    fi
++
+     printf '%s' "$kver"
+ }
+ 
+-- 
+2.35.1
+

core/mkinitcpio/PKGBUILD

@@ -5,10 +5,11 @@
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - swap zstd for gzip in depends, remove gzip optdepend
 #  - patch to revert back to gzip for default compression
+#  - patch for gzip kernel image support (https://github.com/archlinux/mkinitcpio/pull/86)
 
 pkgname=mkinitcpio
 pkgver=31
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Modular initramfs image creation utility"
 arch=('any')
 url='https://github.com/archlinux/mkinitcpio'
@@ -24,19 +25,23 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image'
 provides=('initramfs')
 backup=('etc/mkinitcpio.conf')
 source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        '0001-use-gzip-for-compression-by-default.patch')
+        '0001-use-gzip-for-compression-by-default.patch'
+        '0002-functions-handle-gzip-compressed-kernels-in-kver_gen.patch')
 install=mkinitcpio.install
 sha512sums=('4ef87c2e4f579b292c38f9c487e78b3b99f6db77909cab322e860e5ca70aca3747fcfc272e2e15c9a3605c924ab178057b8b23151f98debc5d96e65f3c0c49d5'
             'SKIP'
-            '692222c01112b30e2d0a0d48265d481617349074bee968c6dca4926bc4ef6501847a79bd7de403ee10ee2e77a7dcc0422ed49a607fe3e96a4d523e2e569724ad')
+            '209b3c296ac7ee65a025c13df023d063127f0168e1aa3205da7c43d05228104a46f64f7162bded79eca6c46149186964208d01692d8015f4fc7210c8de8eeaee'
+            'c1720f268a29361b54da026eb3aaaea2a36fac519cfc5396e7339e5f938adba43aa11d8cb6089e720e3dd218d1643876f0ca45b6147a0600410863f7e159c9f3')
 b2sums=('0113e288906e3b5fa485c29c00e7df60d85addd96718c45531031a686f18c739fa18303b6cac374d35b85edb7b663e221c8dc9158dff08c75858a4ed4dd154bf'
         'SKIP'
-        '3373b576de3e6fc9d728637f33d7c813bdff20925dc266cab570aea9978927f2d039aa3f8a509b48dcb1c37fd64c65983a1de23db288befdf1005c08dab0f664')
+        'd96248a70627fa81e0cb0ddef4729d215f1277d080e76164ecaf08eeb62264a4a3c10be0683d2469669012f3b1b7e0c7c94745786f29e25fc9e9bb471d39df54'
+        'bfeb8e9bccd8a0644b282bbb78f99acb2e057102c7abe3054baf2ef55cd9de0b8bde5519a8b8aac289652d002a59a9215ecb7449349fb5f9a6158bc6b64afa88')
 validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB')    # Giancarlo Razzolini
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i ../0001-use-gzip-for-compression-by-default.patch
+  patch -p1 -i ../0002-functions-handle-gzip-compressed-kernels-in-kver_gen.patch
 }
 
 check() {