sys-kernel/linux-firmware: Fix exclusion of amd-uc.img from savedconfig file

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/sys-kernel/linux-firmware/linux-firmware-20190726.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190726-r1.ebuild
similarity index 98%
rename from sys-kernel/linux-firmware/linux-firmware-20190726.ebuild
rename to sys-kernel/linux-firmware/linux-firmware-20190726-r1.ebuild
index 9baa48016e3dd65aa3f9dd9d1a8d51e51add73d2..528214a68b0e43d8a0fe3142f8fbbb56dd285c06 100644 (file)
--- a/sys-kernel/linux-firmware/linux-firmware-20190726.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20190726-r1.ebuild
@@ -274,13 +274,13 @@ src_prepare() {
        fi
 
        echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-       find * ! -type d \( ! -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
+       find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
 
        if use savedconfig; then
                restore_config ${PN}.conf
 
                ebegin "Removing all files not listed in config"
-               find ! -type d ! -name ${PN}.conf -printf "%P\n" \
+               find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
                        | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
                                || die "grep failed, empty config file?") \
                        | xargs -d '\n' --no-run-if-empty rm

diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index c2afff9ee0c03f2bbdf4f37b2ba4edfc32a76989..bc18789f40bd7558b673bfc083dbedeea30b4375 100644 (file)
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -274,13 +274,13 @@ src_prepare() {
        fi
 
        echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-       find * ! -type d \( ! -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
+       find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
 
        if use savedconfig; then
                restore_config ${PN}.conf
 
                ebegin "Removing all files not listed in config"
-               find ! -type d ! -name ${PN}.conf -printf "%P\n" \
+               find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
                        | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
                                || die "grep failed, empty config file?") \
                        | xargs -d '\n' --no-run-if-empty rm