archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-09-19 22:08:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

core/mkinitcpio to 37-1

Browse source
This commit is contained in:
Kevin Mihelich 2023-11-16 20:07:08 +00:00
parent a6dad6e51c
commit 8389e09342
5 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/mkinitcpio/.SRCINFO
View file

@ -1,6 +1,6 @@
pkgbase = mkinitcpio pkgbase = mkinitcpio
pkgdesc = Modular initramfs image creation utility pkgdesc = Modular initramfs image creation utility
pkgver = 36 pkgver = 37
pkgrel = 1 pkgrel = 1
url = https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio url = https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio
install = mkinitcpio.install install = mkinitcpio.install
@ -31,13 +31,13 @@ pkgbase = mkinitcpio
optdepends = mkinitcpio-nfs-utils: Support for root filesystem on NFS optdepends = mkinitcpio-nfs-utils: Support for root filesystem on NFS
provides = initramfs provides = initramfs
backup = etc/mkinitcpio.conf backup = etc/mkinitcpio.conf
source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-36.tar.gz source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-37.tar.gz
source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-36.tar.gz.sig source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-37.tar.gz.sig
validpgpkeys = ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB validpgpkeys = ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB
validpgpkeys = C100346676634E80C940FB9E9C02FF419FECBE16 validpgpkeys = C100346676634E80C940FB9E9C02FF419FECBE16
sha512sums = f13cfdfee62dc1a344b75413fde8f35eb594c4c372d4a2ed8bbc22f2c01d93ea59d423807d06d19a6d1789e47b35286845daffeffef0fec4bae022e0e92b7b64 sha512sums = 45548350cd66de6ba2ba5260db3c72d0b6153be36c068ebbd81725252d1dc62fd5dd798acd4a0245c7b58710fa2fea7c3066bd99ecd498dfc154177459af2038
sha512sums = SKIP sha512sums = SKIP
b2sums = b60d8e61a15167df3316a7336467740efd4888784228dd6a08b1d974c54c479c082ba142eb60d3f356b06053e5c472f747e0ca830d50bed9f31c13d52b549ca1 b2sums = 84c5122c3775f136bb768580519cb91a18769184d947cfe0e2c714607fe3e7f3e210cf4b58252fad831be8b211e18d7bef33acede97fa273775437d11f25fe07
b2sums = SKIP b2sums = SKIP
pkgname = mkinitcpio pkgname = mkinitcpio

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

@ -1,4 +1,4 @@
From 632c61c58f834442cc43bfd93bdc1d6e9747b7cf Mon Sep 17 00:00:00 2001 From 3ceb9e3e9624a8c7915f086eeb17813453a25acc Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org> From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 20 Feb 2021 10:02:34 -0700 Date: Sat, 20 Feb 2021 10:02:34 -0700
Subject: [PATCH 1/3] use gzip for compression by default Subject: [PATCH 1/3] use gzip for compression by default
@ -23,10 +23,10 @@ index 69bbc6a..ad60b6b 100644
+ +
It is not hard to realize that a filter such as a _tac_ or _rev_ will cause It is not hard to realize that a filter such as a _tac_ or _rev_ will cause
diff --git a/mkinitcpio b/mkinitcpio diff --git a/mkinitcpio b/mkinitcpio
index da80fae..b68917c 100755 index b758f85..98a80e0 100755
--- a/mkinitcpio --- a/mkinitcpio
+++ b/mkinitcpio +++ b/mkinitcpio
@@ -922,7 +922,7 @@ if [[ -n "$_optgenimg" ]]; then @@ -952,7 +952,7 @@ if [[ -n "$_optgenimg" ]]; then
die "Unable to write to '%s'" "$_optgenimg" die "Unable to write to '%s'" "$_optgenimg"
fi fi

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

@ -1,4 +1,4 @@
From 7c407f4ddee777d54b746bab612f8914ce1e1339 Mon Sep 17 00:00:00 2001 From 65f5014fe991afcd2572bdba235e5d90b35c9d2f Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net> From: Janne Grunau <j@jannau.net>
Date: Sun, 30 Jan 2022 10:01:43 +0000 Date: Sun, 30 Jan 2022 10:01:43 +0000
Subject: [PATCH 2/3] functions: handle gzip compressed kernels in kver_generic Subject: [PATCH 2/3] functions: handle gzip compressed kernels in kver_generic
@ -9,10 +9,10 @@ Signed-off-by: Janne Grunau <j@jannau.net>
1 file changed, 5 insertions(+) 1 file changed, 5 insertions(+)
diff --git a/functions b/functions diff --git a/functions b/functions
index cc47594..5b90a4b 100644 index 8a689ee..6eab867 100644
--- a/functions --- a/functions
+++ b/functions +++ b/functions
@@ -228,6 +228,11 @@ kver_generic() { @@ -301,6 +301,11 @@ kver_generic() {
read -r _ _ kver _ < <($reader "$1" | grep -m1 -aoE 'Linux version .(\.[-[:alnum:]+]+)+') read -r _ _ kver _ < <($reader "$1" | grep -m1 -aoE 'Linux version .(\.[-[:alnum:]+]+)+')

14
core/mkinitcpio/0003-check-for-ALARM-kernels-in-run_post_hooks.patch
View file

@ -1,4 +1,4 @@
From e6cc3b8af961e2a54d4336e646f16580a9d2f0e3 Mon Sep 17 00:00:00 2001 From 9fec194bd1d8ab8faef6d098640564a18dbc225c Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org> From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 21 Mar 2023 17:56:32 -0600 Date: Tue, 21 Mar 2023 17:56:32 -0600
Subject: [PATCH 3/3] check for ALARM kernels in run_post_hooks Subject: [PATCH 3/3] check for ALARM kernels in run_post_hooks
@ -9,12 +9,12 @@ Subject: [PATCH 3/3] check for ALARM kernels in run_post_hooks
2 files changed, 31 insertions(+), 5 deletions(-) 2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/functions b/functions diff --git a/functions b/functions
index 5b90a4b..a8943e2 100644 index 6eab867..c26c4d1 100644
--- a/functions --- a/functions
+++ b/functions +++ b/functions
@@ -224,13 +224,28 @@ kver_generic() { @@ -297,13 +297,28 @@ kver_generic() {
# https://elixir.bootlin.com/linux/v5.7.2/source/init/version.c#L46 reader='zcat'
local kver='' reader='cat' fi
- [[ "$(detect_compression "$1")" == 'gzip' ]] && reader='zcat' - [[ "$(detect_compression "$1")" == 'gzip' ]] && reader='zcat'
+ if [[ $1 =~ "/zImage" || $1 =~ /kernel7.img ]]; then + if [[ $1 =~ "/zImage" || $1 =~ /kernel7.img ]]; then
@ -47,10 +47,10 @@ index 5b90a4b..a8943e2 100644
printf '%s' "$kver" printf '%s' "$kver"
diff --git a/mkinitcpio b/mkinitcpio diff --git a/mkinitcpio b/mkinitcpio
index b68917c..1f77acb 100755 index 98a80e0..b7d6b15 100755
--- a/mkinitcpio --- a/mkinitcpio
+++ b/mkinitcpio +++ b/mkinitcpio
@@ -850,6 +850,17 @@ if [[ "$KERNELVERSION" != 'none' ]]; then @@ -880,6 +880,17 @@ if [[ "$KERNELVERSION" != 'none' ]]; then
done done
fi fi

18
core/mkinitcpio/PKGBUILD
View file

@ -9,7 +9,7 @@
# - patch for gzip kernel image support (https://github.com/archlinux/mkinitcpio/pull/86) # - patch for gzip kernel image support (https://github.com/archlinux/mkinitcpio/pull/86)
pkgname=mkinitcpio pkgname=mkinitcpio
pkgver=36 pkgver=37
pkgrel=1 pkgrel=1
pkgdesc="Modular initramfs image creation utility" pkgdesc="Modular initramfs image creation utility"
arch=('any') arch=('any')
@ -31,16 +31,16 @@ source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,
'0002-functions-handle-gzip-compressed-kernels-in-kver_gen.patch' '0002-functions-handle-gzip-compressed-kernels-in-kver_gen.patch'
'0003-check-for-ALARM-kernels-in-run_post_hooks.patch') '0003-check-for-ALARM-kernels-in-run_post_hooks.patch')
install=mkinitcpio.install install=mkinitcpio.install
sha512sums=('f13cfdfee62dc1a344b75413fde8f35eb594c4c372d4a2ed8bbc22f2c01d93ea59d423807d06d19a6d1789e47b35286845daffeffef0fec4bae022e0e92b7b64' sha512sums=('45548350cd66de6ba2ba5260db3c72d0b6153be36c068ebbd81725252d1dc62fd5dd798acd4a0245c7b58710fa2fea7c3066bd99ecd498dfc154177459af2038'
'SKIP' 'SKIP'
'606ddec26b7b70976f3892cd195d1feb5eee9b79867573bff40a3aa3614b84de85b2cd8abc6929eda8c420930407bc3aa0cf4edc13891ab1a74c845e0c435b9f' '24f8431b23ee039fc1aee7b10482d310a8fe37a36975e83aa31d3d0d35d12973c1397057876425fe712be25e999b10753ae05613f3900eccfe5af47e86eda202'
'e4f4eceefa20716631a2bb5bed02b0a7484c39c49e977ebc6d3b8ee0c7a4228e48ad94fd85aa6adb32958bbc57ab5844dafaf15c9b5e016deb97c2a9e0cfbe1e' 'e7c14829c0b5c1330819bfef00923f92a1eb59f6d9cf41b8ac421dc970497b9c75e093b37a41f63aa75f9c11ba3ac72c5385d3a00c6a7686cfda82a1a9ad1883'
'f8743e9e6da85c77a89bf8bc28af44d8b40997d3d1f0ce7735e31e323bb3c9d156811c28a045322acaa91befdeed8c6ce281c2659dc0c6ab81c73c674e2ef6a2') 'd16c37550da527ef1ca1451c9c81c52197f10a30dfa91aa434a55562f06d4ac97c90f1cb3008b1ba612d6ccf3a46683e001a6e2ba04088d2169274e561183f24')
b2sums=('b60d8e61a15167df3316a7336467740efd4888784228dd6a08b1d974c54c479c082ba142eb60d3f356b06053e5c472f747e0ca830d50bed9f31c13d52b549ca1' b2sums=('84c5122c3775f136bb768580519cb91a18769184d947cfe0e2c714607fe3e7f3e210cf4b58252fad831be8b211e18d7bef33acede97fa273775437d11f25fe07'
'SKIP' 'SKIP'
'be971d8a9d194a35907afadc24bc5cb9b0b2434c264fa595c73c828912c694d5dc5c3129f2da8e74a38fd5439b9bcdc6a49c8ee9873bcd3f8e9c5af2a1269eb0' 'f62db2646bb8828de66e73ea479b2276bba970c5338451e2df4122012d42f453e6fc6892702a58cf36b94f759a8ed7d2f65782067922578d81ae1aaa8cc78806'
'5c28cf1c0a7492736c0a074f5fc085e581b219b25fe6bdb81a3d8f07cbc0e334d76a2565b32cb841724550671d62429fa950ae6ce472420f6fe0c2049f61a753' 'e0dc41210fb7b811624758022b4254c396d243460e63c86358fe46dc18510a39e021ff9c53944dffb8ec5fbd37681c47f4f83714b63751b7a57d7d9710f47cca'
'6a5fe2da925f9f5327e14cb339226ed36ac416a00b7b6b09d4c9d332ddaf8f982921d1ea3f2af0d17e4add7a0cc4a253047265ddcc3e98a707b13f28bf294775') '107ef9ee2623a3634a31d62b49efc316615e4c34c847f27a55886c93b2bdb87020bcd7f513ab922de730fe4a6d3bffd26a82180467c14c0993c603bc8801b5df')
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud 'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud