commit: d8f9d290054a758eaad85194c40ff7ccfce71d85 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Sun Nov 26 15:22:16 2023 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Sun Nov 26 15:22:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f9d290
sys-kernel/linux-firmware: upd EAPI 7->8, add dedup optional logic Move upstream's deduplication part of their script, which requires rdfind, behind a new use flag: deduplicate Patch will remove the deduplication part of the script based on use flag. Thanks to Sam for the review Closes: https://bugs.gentoo.org/917324 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index ccaa3a11c7ef..01fe7c79c96d 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit linux-info mount-boot savedconfig multiprocessing # In case this is a real snapshot, fill in commit below. @@ -29,9 +29,10 @@ LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT ) unknown-license? ( all-rights-reserved )" SLOT="0" -IUSE="compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license" +IUSE="compress-xz compress-zstd deduplicate initramfs +redistributable savedconfig unknown-license" REQUIRED_USE="initramfs? ( redistributable ) - ?? ( compress-xz compress-zstd )" + ?? ( compress-xz compress-zstd ) + savedconfig? ( !deduplicate )" RESTRICT="binchecks strip test unknown-license? ( bindist )" @@ -39,7 +40,7 @@ RESTRICT="binchecks strip test BDEPEND="initramfs? ( app-arch/cpio ) compress-xz? ( app-arch/xz-utils ) compress-zstd? ( app-arch/zstd ) - app-misc/rdfind" + deduplicate? ( app-misc/rdfind )" #add anything else that collides to this RDEPEND="!savedconfig? ( @@ -63,6 +64,7 @@ RDEPEND="!savedconfig? ( )" QA_PREBUILT="*" +PATCHES=( "${FILESDIR}/${PN}-remove-rdfind-dep-and-use.patch" ) pkg_setup() { if use compress-xz || use compress-zstd ; then @@ -98,6 +100,7 @@ src_unpack() { } src_prepare() { + use deduplicate && export LINUX_FIRMWARE_DO_DEDUPE=1 default find . -type f -not -perm 0644 -print0 \
