commit: 9dc490b25970d615b012fa2db31bc8201f22cfec Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> AuthorDate: Tue Dec 30 13:18:02 2025 +0000 Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> CommitDate: Sun Jan 11 15:45:29 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc490b2
sys-kernel/linux-firmware: add 20251125_p20251229, resolve blockers only block against sys-firmware/alsa-firmware if deduplicate is disabled. Remove empty files created by copy-firmware.sh. Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/45204 Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> sys-kernel/linux-firmware/Manifest | 1 + ...ebuild => linux-firmware-20251125_p20251229.ebuild} | 18 +++++++++--------- .../linux-firmware/linux-firmware-99999999.ebuild | 16 ++++++++-------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index 738ef113fbc3..f5754da9f789 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -13,3 +13,4 @@ DIST linux-firmware-20251111.tar.xz 595353484 BLAKE2B 864c2a8903db3c3e849394e9d4 DIST linux-firmware-20251125.tar.xz 606928844 BLAKE2B 4803016d2d20f348dc5d8e54d934219c0070a9e6f486a79f25e09e374aec0fb06a8e6916ea3e10bdb5f4b2ca3d77336e010ab98afaf31122072473e8c2482a33 SHA512 1e22970e23b3b0f850ce91c307cbcef57b06db42380ee99f8f11a9445da96abe667fbfe5d733403f9d374add6ecd908cb25ec59b822f011061a35ca9e600403b DIST linux-firmware-20251125_p20251202.tar.bz2 869422110 BLAKE2B e25f960aa1d975596269bbd450b66361bd7673b09674ea2ee9d5684de98356b6f098a03e37fb307a0e153f12b31dc797315a3456fa59509cdcd9682ca5343ea2 SHA512 53497ab9dcca67db6b4b1709d2d1ca07be0781c4c8c3afddf232c87fee368ef630f078e05555a31a791d2e0e625e6c8d335f030d3aebfd7fc38cc7066bc7f2ac DIST linux-firmware-20251125_p20251203.tar.bz2 869415601 BLAKE2B 0c53dbcd23aa625983d7fdf3055eb39c0b39ef8e14aa6744aa6c9a00c93e85b5a2600f1b67f3320f3bcda84d577a92bc3f5d14e9393400e9ee4ccc39aed5ec7e SHA512 ab114e73e9303bab6e5f7f06942f9a803e28bd91df94173c2ef234aa88607bc6bd281d356678d333fa8f2b523a04742309d7cc0249ba759f8f491342bf395062 +DIST linux-firmware-20251125_p20251229.tar.bz2 874700056 BLAKE2B 1b1b133104368c37618041393723a02cfdbb04fc91bd53f745ced9c5d90d19f270860a3cc80e78212b5f290338fc80f1e7d7e777205e7eb648dde1e6ba8dbc7d SHA512 c3c8055b0f277ba08a7a5fc2fde62a29427a0254e2ca0b3a25353a4cc23ad103343caa856d84d1aaa61d428a6213e351192109b537df4275911d11939b1ecca2 diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-20251125_p20251229.ebuild similarity index 95% copy from sys-kernel/linux-firmware/linux-firmware-99999999.ebuild copy to sys-kernel/linux-firmware/linux-firmware-20251125_p20251229.ebuild index c952ffe6b86d..528cdb7d940d 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20251125_p20251229.ebuild @@ -6,7 +6,7 @@ inherit dist-kernel-utils eapi9-ver linux-info mount-boot savedconfig # In case this is a real snapshot, fill in commit below. # For normal, tagged releases, leave blank -MY_COMMIT="" +MY_COMMIT="154800e885413bdf90b80b94e2e12f441be79fde" if [[ ${PV} == 99999999* ]]; then inherit git-r3 @@ -47,15 +47,15 @@ BDEPEND="initramfs? ( app-alternatives/cpio ) #add anything else that collides to this RDEPEND="!savedconfig? ( redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] + !sys-firmware/alsa-firmware[alsa_cards_ca0132,-deduplicate(-)] !sys-block/qla-fc-firmware !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( - !sys-firmware/alsa-firmware[alsa_cards_korg1212] - !sys-firmware/alsa-firmware[alsa_cards_maestro3] - !sys-firmware/alsa-firmware[alsa_cards_sb16] - !sys-firmware/alsa-firmware[alsa_cards_ymfpci] + !sys-firmware/alsa-firmware[alsa_cards_korg1212,-deduplicate(-)] + !sys-firmware/alsa-firmware[alsa_cards_maestro3,-deduplicate(-)] + !sys-firmware/alsa-firmware[alsa_cards_sb16,-deduplicate(-)] + !sys-firmware/alsa-firmware[alsa_cards_ymfpci,-deduplicate(-)] ) ) dist-kernel? ( @@ -289,7 +289,6 @@ src_prepare() { } src_install() { - local FW_OPTIONS=( "-v" "-j1" ) local files_to_keep= @@ -317,8 +316,9 @@ src_install() { einfo "Removing broken symlinks ..." find * -xtype l -print -delete || die - # remove empty directories, bug #396073 - find -type d -empty -delete || die + # remove empty files and directories, bug #396073 + # Copy-firmware.sh may have made empty copies of files we removed + find -empty -delete || die # sanity check if ! ( shopt -s failglob; : * ) 2>/dev/null; then diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index c952ffe6b86d..c54a693fa822 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -47,15 +47,15 @@ BDEPEND="initramfs? ( app-alternatives/cpio ) #add anything else that collides to this RDEPEND="!savedconfig? ( redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] + !sys-firmware/alsa-firmware[alsa_cards_ca0132,-deduplicate(-)] !sys-block/qla-fc-firmware !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( - !sys-firmware/alsa-firmware[alsa_cards_korg1212] - !sys-firmware/alsa-firmware[alsa_cards_maestro3] - !sys-firmware/alsa-firmware[alsa_cards_sb16] - !sys-firmware/alsa-firmware[alsa_cards_ymfpci] + !sys-firmware/alsa-firmware[alsa_cards_korg1212,-deduplicate(-)] + !sys-firmware/alsa-firmware[alsa_cards_maestro3,-deduplicate(-)] + !sys-firmware/alsa-firmware[alsa_cards_sb16,-deduplicate(-)] + !sys-firmware/alsa-firmware[alsa_cards_ymfpci,-deduplicate(-)] ) ) dist-kernel? ( @@ -289,7 +289,6 @@ src_prepare() { } src_install() { - local FW_OPTIONS=( "-v" "-j1" ) local files_to_keep= @@ -317,8 +316,9 @@ src_install() { einfo "Removing broken symlinks ..." find * -xtype l -print -delete || die - # remove empty directories, bug #396073 - find -type d -empty -delete || die + # remove empty files and directories, bug #396073 + # Copy-firmware.sh may have made empty copies of files we removed + find -empty -delete || die # sanity check if ! ( shopt -s failglob; : * ) 2>/dev/null; then
