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 38-4

Browse source
This commit is contained in:
Kevin Mihelich 2024-03-05 01:31:24 +00:00
parent 9383e08a31
commit f196d03119
6 changed files with 51 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/mkinitcpio/.SRCINFO
View file

@ -1,7 +1,7 @@
pkgbase = mkinitcpio pkgbase = mkinitcpio
pkgdesc = Modular initramfs image creation utility pkgdesc = Modular initramfs image creation utility
pkgver = 37.3 pkgver = 38
pkgrel = 1 pkgrel = 4
url = https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio url = https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio
install = mkinitcpio.install install = mkinitcpio.install
arch = any arch = any
@ -30,14 +30,21 @@ pkgbase = mkinitcpio
optdepends = lz4: Use lz4 compression for the initramfs image optdepends = lz4: Use lz4 compression for the initramfs image
optdepends = mkinitcpio-nfs-utils: Support for root filesystem on NFS optdepends = mkinitcpio-nfs-utils: Support for root filesystem on NFS
provides = initramfs provides = initramfs
conflicts = systemd<255.4-2
conflicts = cryptsetup<2.7.0-3
conflicts = mdadm<4.3-2
conflicts = lvm2<2.03.23-3
backup = etc/mkinitcpio.conf backup = etc/mkinitcpio.conf
source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-37.3.tar.gz source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-38.tar.gz
source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-37.3.tar.gz.sig source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-38.tar.gz.sig
source = mkinitcpio-fix-path.patch::https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/commit/aced07e06b9b274439eeb90e235edf42780b4a7a.patch
validpgpkeys = ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB validpgpkeys = ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB
validpgpkeys = C100346676634E80C940FB9E9C02FF419FECBE16 validpgpkeys = C100346676634E80C940FB9E9C02FF419FECBE16
sha512sums = edee8dfbc452a0fc6ca9e8c7321beffa4463e504641b99a8d08ab9df665b697a0192f7760994b9917f34ba83d15543dedd3c4690364663b4534724a06a262db7 sha512sums = ad1a4895e5cc3a01637f71d96ddb79d7f45708ec7305ffdb874403a1eb3c1743d121f28d93273b91792298eb21bcc0c5d9ef1ab3a3773083d60da5bdaee59d6e
sha512sums = SKIP sha512sums = SKIP
b2sums = f903348aa23983b4de1e095420acc358a09a6fd0c8ed9a9a7b9bd7df0bfde0bb17869996759f8f3c73ada85dd3ee3f83958401e1f9fa15aaacc06b048fe13660 sha512sums = b1387deab0199fdb4e4a417b009467cb6f95b2a3f8074858f8a85b46492ebaf420ac028f13d81acb5a675382cccb896cac62f42e26edd82dc1c3a7f48d4d822b
b2sums = 4bc50da7196a69dc0ab7e7de345684baebbb655f9a07def9ac36a7f1c9aec752cf41c62134d6bbf240d8f49c6492a211f152bab062ec09457791d7ab030f1bc5
b2sums = SKIP b2sums = SKIP
b2sums = 4530828b559c08aa14f3663b8a078c71bb739adcbd1dfbf21947cfe837ec51fc8ed7e7586c53a4e0ee4b7d86784acab5edf916c387e7385a78fe98c825177fa9
pkgname = mkinitcpio pkgname = mkinitcpio

6
core/mkinitcpio/.nvchecker.toml Normal file
View file

@ -0,0 +1,6 @@
[mkinitcpio]
source = "gitlab"
gitlab = "archlinux/mkinitcpio/mkinitcpio"
host = "gitlab.archlinux.org"
use_max_tag = true
prefix = "v"

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

@ -1,4 +1,4 @@
From 3ceb9e3e9624a8c7915f086eeb17813453a25acc Mon Sep 17 00:00:00 2001 From 74924b627ddc4093849b581d57c86a68dcea7000 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 b758f85..98a80e0 100755 index d6bec2f..c6d5731 100755
--- a/mkinitcpio --- a/mkinitcpio
+++ b/mkinitcpio +++ b/mkinitcpio
@@ -952,7 +952,7 @@ if [[ -n "$_optgenimg" ]]; then @@ -998,7 +998,7 @@ if [[ -n "$_optgenimg" ]]; then
die "Unable to write to '%s'" "$_optgenimg" die "Unable to write to '%s'" "$_optgenimg"
fi fi
@ -36,11 +36,11 @@ index b758f85..98a80e0 100755
warning "Unable to locate compression method: '%s'" "$_optcompress" warning "Unable to locate compression method: '%s'" "$_optcompress"
_optcompress='cat' _optcompress='cat'
diff --git a/mkinitcpio.conf b/mkinitcpio.conf diff --git a/mkinitcpio.conf b/mkinitcpio.conf
index 710e05f..4a2ce87 100644 index fc54be6..f728198 100644
--- a/mkinitcpio.conf --- a/mkinitcpio.conf
+++ b/mkinitcpio.conf +++ b/mkinitcpio.conf
@@ -52,7 +52,7 @@ FILES=() @@ -55,7 +55,7 @@ FILES=()
HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems fsck) HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck)
# COMPRESSION # COMPRESSION
-# Use this to compress the initramfs image. By default, zstd compression -# Use this to compress the initramfs image. By default, zstd compression

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

@ -1,4 +1,4 @@
From 65f5014fe991afcd2572bdba235e5d90b35c9d2f Mon Sep 17 00:00:00 2001 From bf800eb0b545829bd1a63ffd862b8b093ed0060a 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,7 +9,7 @@ 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 8a689ee..6eab867 100644 index ca12618..75b379e 100644
--- a/functions --- a/functions
+++ b/functions +++ b/functions
@@ -301,6 +301,11 @@ kver_generic() { @@ -301,6 +301,11 @@ kver_generic() {

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

@ -1,4 +1,4 @@
From 9fec194bd1d8ab8faef6d098640564a18dbc225c Mon Sep 17 00:00:00 2001 From b2b9ece774103b899d03526f6278451f0213d1fe 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,7 +9,7 @@ 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 6eab867..c26c4d1 100644 index 75b379e..287bd46 100644
--- a/functions --- a/functions
+++ b/functions +++ b/functions
@@ -297,13 +297,28 @@ kver_generic() { @@ -297,13 +297,28 @@ kver_generic() {
@ -47,10 +47,10 @@ index 6eab867..c26c4d1 100644
printf '%s' "$kver" printf '%s' "$kver"
diff --git a/mkinitcpio b/mkinitcpio diff --git a/mkinitcpio b/mkinitcpio
index 98a80e0..b7d6b15 100755 index c6d5731..fc90cd1 100755
--- a/mkinitcpio --- a/mkinitcpio
+++ b/mkinitcpio +++ b/mkinitcpio
@@ -880,6 +880,17 @@ if [[ "$KERNELVERSION" != 'none' ]]; then @@ -923,6 +923,17 @@ if [[ "$KERNELVERSION" != 'none' ]]; then
done done
fi fi

30
core/mkinitcpio/PKGBUILD
View file

@ -9,8 +9,8 @@
# - 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=37.3 pkgver=38
pkgrel=1 pkgrel=4
pkgdesc="Modular initramfs image creation utility" pkgdesc="Modular initramfs image creation utility"
arch=('any') arch=('any')
url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio' url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio'
@ -18,6 +18,12 @@ license=('GPL')
depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils' depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'systemd') 'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'systemd')
makedepends=('asciidoc') makedepends=('asciidoc')
conflicts=(
'systemd<255.4-2'
'cryptsetup<2.7.0-3'
'mdadm<4.3-2'
'lvm2<2.03.23-3'
)
checkdepends=('bats' 'bats-assert' 'lzop') checkdepends=('bats' 'bats-assert' 'lzop')
optdepends=('xz: Use lzma or xz compression for the initramfs image' optdepends=('xz: Use lzma or xz compression for the initramfs image'
'bzip2: Use bzip2 compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image'
@ -27,25 +33,29 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image'
provides=('initramfs') provides=('initramfs')
backup=('etc/mkinitcpio.conf') backup=('etc/mkinitcpio.conf')
source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
"$pkgname-fix-path.patch::https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/commit/aced07e06b9b274439eeb90e235edf42780b4a7a.patch"
'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' '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=('edee8dfbc452a0fc6ca9e8c7321beffa4463e504641b99a8d08ab9df665b697a0192f7760994b9917f34ba83d15543dedd3c4690364663b4534724a06a262db7' sha512sums=('ad1a4895e5cc3a01637f71d96ddb79d7f45708ec7305ffdb874403a1eb3c1743d121f28d93273b91792298eb21bcc0c5d9ef1ab3a3773083d60da5bdaee59d6e'
'SKIP' 'SKIP'
'24f8431b23ee039fc1aee7b10482d310a8fe37a36975e83aa31d3d0d35d12973c1397057876425fe712be25e999b10753ae05613f3900eccfe5af47e86eda202' 'b1387deab0199fdb4e4a417b009467cb6f95b2a3f8074858f8a85b46492ebaf420ac028f13d81acb5a675382cccb896cac62f42e26edd82dc1c3a7f48d4d822b'
'e7c14829c0b5c1330819bfef00923f92a1eb59f6d9cf41b8ac421dc970497b9c75e093b37a41f63aa75f9c11ba3ac72c5385d3a00c6a7686cfda82a1a9ad1883' '52f9913b8c297919db34844439df0799d8699aa75f9d2adbdaf2bb3e68eee54ec9d27946ecd9e2053fef4057ae1859dedc7d99d8da7110b31ff9ac6970e970c1'
'd16c37550da527ef1ca1451c9c81c52197f10a30dfa91aa434a55562f06d4ac97c90f1cb3008b1ba612d6ccf3a46683e001a6e2ba04088d2169274e561183f24') '7c0ea267567c23c37dc5b5aac587e64885ff36ec9818a250687b40ad4903ea74d50b033d1b1a1dd46f968cab53f70f3da96af171d8f2fdf1aacaca328fbd4e2d'
b2sums=('f903348aa23983b4de1e095420acc358a09a6fd0c8ed9a9a7b9bd7df0bfde0bb17869996759f8f3c73ada85dd3ee3f83958401e1f9fa15aaacc06b048fe13660' '674729df541f852153fb634b391df2b2af037efc9f2561c9ed1c211ce8b05e21f30f603a44c552283b449534b3f2ab95150fc0adc088069c86f91dfede5f7f3c')
b2sums=('4bc50da7196a69dc0ab7e7de345684baebbb655f9a07def9ac36a7f1c9aec752cf41c62134d6bbf240d8f49c6492a211f152bab062ec09457791d7ab030f1bc5'
'SKIP' 'SKIP'
'f62db2646bb8828de66e73ea479b2276bba970c5338451e2df4122012d42f453e6fc6892702a58cf36b94f759a8ed7d2f65782067922578d81ae1aaa8cc78806' '4530828b559c08aa14f3663b8a078c71bb739adcbd1dfbf21947cfe837ec51fc8ed7e7586c53a4e0ee4b7d86784acab5edf916c387e7385a78fe98c825177fa9'
'e0dc41210fb7b811624758022b4254c396d243460e63c86358fe46dc18510a39e021ff9c53944dffb8ec5fbd37681c47f4f83714b63751b7a57d7d9710f47cca' '3c8ca4927c9eb39c8923e1000cf301605e2ded6d18d5d551941fdd8fc2c4a4b24ceff6593cf7afa02391f8559fafce5c80cfffd854612323905a41c90f55bb43'
'107ef9ee2623a3634a31d62b49efc316615e4c34c847f27a55886c93b2bdb87020bcd7f513ab922de730fe4a6d3bffd26a82180467c14c0993c603bc8801b5df') 'c089ac622e6550c0ad9dc361c552e524b547f1124c127e8f32d7bd25ad45be7cbfe6afe1e0152d104f7c9c6a7e0d54f850b90b579bee33f9466a71c4cd40fa22'
'dc5cd0fee2dc44cc76000e4875672b4e8b6cd53a09e7e98df2f648a8706dd276a06836bbe74903ad16d3633f104ac33a641d08e15a035cb379d92cb0fd0f84f3')
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud 'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud
prepare() { prepare() {
cd "$pkgname-$pkgver" cd "$pkgname-$pkgver"
patch -Np1 < "$srcdir/mkinitcpio-fix-path.patch"
patch -p1 -i ../0001-use-gzip-for-compression-by-default.patch patch -p1 -i ../0001-use-gzip-for-compression-by-default.patch
patch -p1 -i ../0002-functions-handle-gzip-compressed-kernels-in-kver_gen.patch patch -p1 -i ../0002-functions-handle-gzip-compressed-kernels-in-kver_gen.patch
patch -p1 -i ../0003-check-for-ALARM-kernels-in-run_post_hooks.patch patch -p1 -i ../0003-check-for-ALARM-kernels-in-run_post_hooks.patch