commit: 7a8f2ec34bc4c2600bd7802d816c60b41a557582
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 3 13:24:16 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 13:26:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8f2ec3
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 <AT> gentoo.org>
...nux-firmware-20190726.ebuild => linux-firmware-20190726-r1.ebuild} | 4 ++--
sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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 9baa48016e3..528214a68b0 100644
--- 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 c2afff9ee0c..bc18789f40b 100644
--- 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
