* update mkinitcpio to 39.2-2
This commit is contained in:
parent
4b8205ddb9
commit
f3daab50f9
14
mkinitcpio/0001-trigger.patch
Normal file
14
mkinitcpio/0001-trigger.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff --git a/libalpm/hooks/90-mkinitcpio-install.hook b/libalpm/hooks/90-mkinitcpio-install.hook
|
||||||
|
index 446b7d7..5582f12 100644
|
||||||
|
--- a/libalpm/hooks/90-mkinitcpio-install.hook
|
||||||
|
+++ b/libalpm/hooks/90-mkinitcpio-install.hook
|
||||||
|
@@ -6,6 +6,9 @@ Operation = Remove
|
||||||
|
Target = usr/lib/initcpio/*
|
||||||
|
Target = usr/lib/firmware/*
|
||||||
|
Target = usr/src/*/dkms.conf
|
||||||
|
+Target = usr/lib/systemd/systemd
|
||||||
|
+Target = usr/bin/cryptsetup
|
||||||
|
+Target = usr/bin/lvm
|
||||||
|
|
||||||
|
[Trigger]
|
||||||
|
Type = Path
|
@ -24,19 +24,24 @@ optdepends=('gzip: Use gzip 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.xz"{,.sig}
|
source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
|
||||||
'0001-trigger.patch')
|
'0001-trigger.patch'
|
||||||
|
'mkinitcpio-archpower-support.patch')
|
||||||
sha512sums=('e4ba9fe901da56bb116510ec0c6abeba5153e57d9545baccbc466932951b7f324aa75ef7cc3de87f966456b0365b17552f367411d62585d500e88dc5c815058b'
|
sha512sums=('e4ba9fe901da56bb116510ec0c6abeba5153e57d9545baccbc466932951b7f324aa75ef7cc3de87f966456b0365b17552f367411d62585d500e88dc5c815058b'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'b21e3961294e80bedd89a7e332ab11fc3b83eebfaf58d8f658e30f7d9caf2f84f4934224173c70f111932de8538fa327f5f6bfe9576b11bcbaf84d2d5ad8e85d')
|
'b21e3961294e80bedd89a7e332ab11fc3b83eebfaf58d8f658e30f7d9caf2f84f4934224173c70f111932de8538fa327f5f6bfe9576b11bcbaf84d2d5ad8e85d'
|
||||||
|
'de907548a0fce2097fcbf5144f0ff9978c4d09622dd24113ebc217fea083591ed7c03623502c3d41cef5ba7f116afccf6a16dd38d737e4279cdac802c9dc5cb8')
|
||||||
b2sums=('7bd6bf491dd8b23d83e42834566375736cf8868d5120c7e24f4c8923eb03a64864cdda51d6a6f41373db88c29905535e4c8aa4bde172955bc7529e6b3ffc252c'
|
b2sums=('7bd6bf491dd8b23d83e42834566375736cf8868d5120c7e24f4c8923eb03a64864cdda51d6a6f41373db88c29905535e4c8aa4bde172955bc7529e6b3ffc252c'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'3b8e08d56e209ad11827d65595ab245bb680e72fb81139ba946e7610d16214c2a9022f1a1794e6797ef07fb0a43c5239167729225daf89396a8920f39f75e34b')
|
'3b8e08d56e209ad11827d65595ab245bb680e72fb81139ba946e7610d16214c2a9022f1a1794e6797ef07fb0a43c5239167729225daf89396a8920f39f75e34b'
|
||||||
|
'84e4bedf946bbc5221d50c22e0523b8a83f2215b666d272497f67b5c54a4c89f44d849c0b934baf94dc9a5e3fc8062baaa145d84ebe106940c63073f5555a231')
|
||||||
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
|
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
|
||||||
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud
|
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
cd "$pkgname-$pkgver"
|
cd "$pkgname-$pkgver"
|
||||||
patch -Np1 < ../0001-trigger.patch
|
patch -Np1 < ../0001-trigger.patch
|
||||||
|
|
||||||
|
patch -Np1 < ../mkinitcpio-archpower-support.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
|
@ -59,3 +59,15 @@ diff -ruN mkinitcpio-39.2.orig/mkinitcpio mkinitcpio-39.2/mkinitcpio
|
|||||||
error "kernel version extraction from image not supported for '%s' architecture" "$arch"
|
error "kernel version extraction from image not supported for '%s' architecture" "$arch"
|
||||||
error "there's a chance the generic version extractor may work with a valid uncompressed kernel image"
|
error "there's a chance the generic version extractor may work with a valid uncompressed kernel image"
|
||||||
fi
|
fi
|
||||||
|
--- mkinitcpio-39.2.orig/test/cases/zsh-completion.bats 2024-07-16 11:26:02.735159982 +0200
|
||||||
|
+++ mkinitcpio-39.2/test/cases/zsh-completion.bats 2024-07-16 11:33:46.005417563 +0200
|
||||||
|
@@ -13,6 +13,9 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
@test "_detect_kver" {
|
||||||
|
+ if [ "$(uname -m)" != 'x86_64' ]; then
|
||||||
|
+ skip "$(uname -m) unsupported"
|
||||||
|
+ fi
|
||||||
|
local kernel_ver tmp_knl
|
||||||
|
kernel_ver="6.0.9-arch1-1 #1 SMP PREEMPT_DYNAMIC Wed, 16 Nov 2022 17:01:17 +0000 x86_64 GNU/Linux"
|
||||||
|
tmp_knl=$(__gen_test_kernel "$kernel_ver")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user