From bf26469fd7a1358ed05fae19a1aed93d6837669d Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 18 Jan 2024 14:13:34 -0800 Subject: [PATCH] main/postmarketos-mkinitfs: add /lib/firmware to list of trigger dirs (MR 4742) In many cases, when fw is installed in /lib/firmware, some of it ends up in the initramfs. In those situations, mkinitfs should run so that the initramfs gets the latest fw. This will result in mkinitfs possibly running in cases where it doesn't matter (i.e. device has fw in /lib/firmware but none is used in the initramfs), but I think the trade-off is worth it. This also breaks the triggers= line into multiple lines so that it's easier to review/maintain. We can't prepend whitespace on these lines since the apkbuild parser expects dirs to be separated by ":" --- main/postmarketos-mkinitfs/APKBUILD | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index 2f0b9b513..4ea3ba903 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Clayton Craft pkgname=postmarketos-mkinitfs pkgver=2.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" depends=" @@ -10,7 +10,17 @@ depends=" " makedepends="go scdoc" replaces="mkinitfs" -triggers="$pkgname.trigger=/usr/share/mkinitfs/*:/usr/share/kernel/*:/usr/share/mkinitfs-triggers:/usr/share/deviceinfo:/usr/libexec/pmos-tests-initramfs:/usr/lib/systemd/boot" + +triggers="$pkgname.trigger=\ +/lib/firmware/*:\ +/usr/lib/systemd/boot:\ +/usr/libexec/pmos-tests-initramfs:\ +/usr/share/deviceinfo:\ +/usr/share/kernel/*:\ +/usr/share/mkinitfs-triggers:\ +/usr/share/mkinitfs/*\ +" + # mkinitfs-vendor-$pkgver.tar.gz: vendored Go deps, is part of the release: # https://gitlab.com/postmarketOS/postmarketos-mkinitfs/-/releases source="