Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / mkinitcpio
Commits: 6cf9c3b8 by Christian Hesse at 2024-05-29T14:41:17+02:00 upgpkg: 39.2-2: fix the libalpm hook trigger Turned out that moving the libalpm hooks from specific packages to mkinitcpio had an unexpected side effect: Updating these packages does no longer trigger the rebuild of initcpios. This is beeing worked on upstream, but let's push an interim workaround for now to be ready for the next systemd feature release. https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/merge_requests/401 - - - - - 3 changed files: - .SRCINFO - + 0001-trigger.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = mkinitcpio pkgdesc = Modular initramfs image creation utility pkgver = 39.2 - pkgrel = 1 + pkgrel = 2 url = https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio arch = any license = GPL-2.0-only @@ -33,11 +33,14 @@ pkgbase = mkinitcpio backup = etc/mkinitcpio.conf source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-39.2.tar.xz source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-39.2.tar.xz.sig + source = 0001-trigger.patch validpgpkeys = ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB validpgpkeys = C100346676634E80C940FB9E9C02FF419FECBE16 sha512sums = e4ba9fe901da56bb116510ec0c6abeba5153e57d9545baccbc466932951b7f324aa75ef7cc3de87f966456b0365b17552f367411d62585d500e88dc5c815058b sha512sums = SKIP + sha512sums = b21e3961294e80bedd89a7e332ab11fc3b83eebfaf58d8f658e30f7d9caf2f84f4934224173c70f111932de8538fa327f5f6bfe9576b11bcbaf84d2d5ad8e85d b2sums = 7bd6bf491dd8b23d83e42834566375736cf8868d5120c7e24f4c8923eb03a64864cdda51d6a6f41373db88c29905535e4c8aa4bde172955bc7529e6b3ffc252c b2sums = SKIP + b2sums = 3b8e08d56e209ad11827d65595ab245bb680e72fb81139ba946e7610d16214c2a9022f1a1794e6797ef07fb0a43c5239167729225daf89396a8920f39f75e34b pkgname = mkinitcpio ===================================== 0001-trigger.patch ===================================== @@ -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 ===================================== PKGBUILD ===================================== @@ -5,7 +5,7 @@ pkgname=mkinitcpio pkgver=39.2 -pkgrel=1 +pkgrel=2 pkgdesc="Modular initramfs image creation utility" arch=('any') url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio' @@ -22,14 +22,22 @@ optdepends=('gzip: Use gzip compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') provides=('initramfs') 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') sha512sums=('e4ba9fe901da56bb116510ec0c6abeba5153e57d9545baccbc466932951b7f324aa75ef7cc3de87f966456b0365b17552f367411d62585d500e88dc5c815058b' - 'SKIP') + 'SKIP' + 'b21e3961294e80bedd89a7e332ab11fc3b83eebfaf58d8f658e30f7d9caf2f84f4934224173c70f111932de8538fa327f5f6bfe9576b11bcbaf84d2d5ad8e85d') b2sums=('7bd6bf491dd8b23d83e42834566375736cf8868d5120c7e24f4c8923eb03a64864cdda51d6a6f41373db88c29905535e4c8aa4bde172955bc7529e6b3ffc252c' - 'SKIP') + 'SKIP' + '3b8e08d56e209ad11827d65595ab245bb680e72fb81139ba946e7610d16214c2a9022f1a1794e6797ef07fb0a43c5239167729225daf89396a8920f39f75e34b') validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini 'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 < ../0001-trigger.patch +} + check() { make -C "$pkgname-$pkgver" check } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/mkinitcpio/-/commit/6cf9c3b8932c29d3f62d4a3d24fe79bdab35e83b -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/mkinitcpio/-/commit/6cf9c3b8932c29d3f62d4a3d24fe79bdab35e83b You're receiving this email because of your account on gitlab.archlinux.org.
