commit: 9b9521345f302df2a469d138bd041d87cf9b6a80
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Nov 29 01:52:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 04:09:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b952134
sys-kernel/linux-firmware: update live to work after upstream changes
The USE=deduplicate patch is already invalidated by upstream commits.
The good news is those upstream commits implement the same feature but
without needing a patch.
Start using the official upstream option instead.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 01fe7c79c96d..6cef5cc50e0e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -64,7 +64,6 @@ RDEPEND="!savedconfig? (
)"
QA_PREBUILT="*"
-PATCHES=( "${FILESDIR}/${PN}-remove-rdfind-dep-and-use.patch" )
pkg_setup() {
if use compress-xz || use compress-zstd ; then
@@ -100,7 +99,6 @@ src_unpack() {
}
src_prepare() {
- use deduplicate && export LINUX_FIRMWARE_DO_DEDUPE=1
default
find . -type f -not -perm 0644 -print0 \
@@ -279,7 +277,7 @@ src_prepare() {
}
src_install() {
- ./copy-firmware.sh -v "${ED}/lib/firmware" || die
+ ./copy-firmware.sh $(usex deduplicate '' '--ignore-duplicates') -v
"${ED}/lib/firmware" || die
pushd "${ED}/lib/firmware" &>/dev/null || die
