core/mkinitcpio to 35.2-1.1

This commit is contained in:
Kevin Mihelich 2023-03-26 22:27:16 +00:00
parent 329730ca29
commit 28e6a62264
4 changed files with 13 additions and 13 deletions

View file

@ -1,4 +1,4 @@
From 4161236377c4ce53c160ca14b32928e6c94574e6 Mon Sep 17 00:00:00 2001
From 19178cb8b2874f83fbd8b3659a2d1d532af881a3 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 20 Feb 2021 10:02:34 -0700
Subject: [PATCH 1/3] use gzip for compression by default

View file

@ -1,4 +1,4 @@
From d7b7d85e2d43b98671d1a47f1dfff3a6df0cc717 Mon Sep 17 00:00:00 2001
From b496620d56fd79078e43d07e9e9bf43c42a4f770 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/3] functions: handle gzip compressed kernels in kver_generic
@ -9,7 +9,7 @@ Signed-off-by: Janne Grunau <j@jannau.net>
1 file changed, 5 insertions(+)
diff --git a/functions b/functions
index ae31e40..c4cc536 100644
index f920c3d..eb3e18a 100644
--- a/functions
+++ b/functions
@@ -223,6 +223,11 @@ kver_generic() {

View file

@ -1,4 +1,4 @@
From 5800829444f1b6d3cb4949c8a7a82f9b8fd22e3c Mon Sep 17 00:00:00 2001
From b6fc34928a69f9e0498589c3e001730bc105539e Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 21 Mar 2023 17:56:32 -0600
Subject: [PATCH 3/3] check for ALARM kernels in run_post_hooks
@ -9,7 +9,7 @@ Subject: [PATCH 3/3] check for ALARM kernels in run_post_hooks
2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/functions b/functions
index c4cc536..e6b21e6 100644
index eb3e18a..8742ef4 100644
--- a/functions
+++ b/functions
@@ -219,13 +219,28 @@ kver_generic() {
@ -17,7 +17,7 @@ index c4cc536..e6b21e6 100644
local kver='' reader='cat'
- [[ "$(detect_compression "$1")" == 'gzip' ]] && reader='zcat'
+ if [[ $1 =~ "/zImage" || $1 =~ /kernel.*\.img ]]; then
+ if [[ $1 =~ "/zImage" || $1 =~ /kernel7.img ]]; then
+ # Check for xz zImage
+ skip=$(LC_ALL=C grep -a -b -o $'\xFD\x37\x7A\x58\x5A\x00' $1 | tail -n 1 | cut -d ':' -f 1)
+ if [[ ! -z $skip ]]; then

View file

@ -10,7 +10,7 @@
pkgname=mkinitcpio
pkgver=35.2
pkgrel=1
pkgrel=1.1
pkgdesc="Modular initramfs image creation utility"
arch=('any')
url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio'
@ -33,14 +33,14 @@ source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,
install=mkinitcpio.install
sha512sums=('9ca8544bc5de3d215bf94ecf9a3bfb9265c9ed9871357af4b597a37e94c6951935641c11558470aaa934e8fbe9bc1f875dfa9d0fe8734a97f90154c9cbabfdba'
'SKIP'
'4205c5977d58728f6cdec22b553e000091e19b28e07c6099c14882842f964f66abf7b1b0a341e9b061e04c3c3ed1275647caf51d3770a61b60271712a8ecf74d'
'693bddd2d3e3760479c6615085a6d7426cf2a6f92a42925192658eae1bcd66ae1bc46027321a2a5538abbb21025467c42d07569024f338b7bb6d4416e9922406'
'4a89522a5350372ee189409529b3e5306a54520ce393eda511230c498ab6d56977e37c528904dcf01a667fa0602e5158bfe4834fd4205c835061cc8844e59b2d')
'b243f29afd7d4e9863421c29dde4b1e1c30c8a45ed0cab5a2453686d5847cfd712d15eb082743fb537d2e2846aab65e8c7e55cce4365d276f2aee9c72a20789d'
'58907a313e03256c852f22e1e41a08464f3bead58728d8b26a015a7996f4b1bfc554f7c44664e476ab186e4bf158b3374eb5315ea3653f19d1a1d5b2cf792a3d'
'bfd5d9ac626c0d50736d76509db90386aa97616f1035e20370d682cf867e2599ed98b2772d13d7f6f7398c10972218148761a5860d0d24d3314e8235a22fa662')
b2sums=('e7d56ea1de8d21271d4e94a61563af9c5f33320a46ce9f006092bb70e2161be02791dfd75b14e9c9b5ad2fbb781617f04b4e49afa93a707785c23773c1a48664'
'SKIP'
'ae8e25ab7e8d4cac52dcee7176bf132ea7cefeab67c3af69cecdf4871f50e42753dbe0c09a6fd20ef69c10a5b56bf6bc8f0614df1fd593d7a1ad3a5043f5c7b5'
'8ca2d8902ae18402c18b3874c3977953a16f3ffaad760f21aafa7f15421a034bdd10fb58962ea5e15ace7407fa1f36343ddfcdca1bcd58ef12aded22ae2cabca'
'20e32564bb0fafc2f742be0866f731e0a0fa0a4b009623564491d5248348e29c7d7864f97747d62298debfc341e72ba73f7393d449515db8d1630ecb36640b58')
'9d1d0dcb044613c34a2c758c422bccddcaa3dc97671c7522a3111e5ac34631f257df28ad65ba0cdaceae1b7676475146215fa5ccfc872e7ba7e73dce67fdb7f6'
'43b60c230b0e992fe8a8539d45d7357e4306cb7e0f383188437b2b309e1bf38ebdcf0e41e683e5c53f8a5dc73a75e370b535d9726b48ec2564d22a42d14fd086'
'e9086540eac07056c73486c4aad947029c412322c2f1a6a0c3ec146ed17363db59364ad96d863337f8e9308ff89419e6dfb82ab9a17efaa13132e5486b1b5b85')
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud