commit: 6539d6f605eefeb29f37ff03ff31802645aefaf3 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Wed Oct 16 19:36:18 2024 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Wed Oct 16 19:36:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6539d6f6
sys-kernel/linux-firmware: changes due to new upstream script additions check_whence.py requires files to be there or it will die. Remove blobs with 'unknown' licenses after that script runs Bug: https://bugs.gentoo.org/941499 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> .../linux-firmware/linux-firmware-99999999.ebuild | 79 +++++++++++----------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index d01ec30a3a38..0f7f36f72df9 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -124,9 +124,10 @@ src_prepare() { | xargs --null --no-run-if-empty chmod 0644 \ || die - chmod +x copy-firmware.sh || die - chmod +x dedup-firmware.sh || die - chmod +x check_whence.py || die + chmod +x "${S}"/{copy-firmware.sh,dedup-firmware.sh,check_whence.py,build_packages.py} || die + chmod +x "${S}"/{carl9170fw/autogen.sh,carl9170fw/genapi.sh} || die + chmod +x "${S}"/contrib/process_linux_firmware.py || die + cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die chmod +x "${T}/make-amd-ucode-img" || die @@ -214,6 +215,40 @@ src_prepare() { mellanox/mlxsw_spectrum-13.2000.1122.mfa2 ) + if use !redistributable; then + # remove files _not_ in the free_software or unknown_license lists + # everything else is confirmed (or assumed) to be redistributable + # based on upstream acceptance policy + einfo "Removing non-redistributable files ..." + local OLDIFS="${IFS}" + local IFS=$'\n' + set -o pipefail + find ! -type d -printf "%P\n" \ + | grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \ + | xargs -d '\n' --no-run-if-empty rm -v + + [[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files" + + IFS="${OLDIFS}" + fi + + restore_config ${PN}.conf +} + +src_install() { + + local FW_OPTIONS=( "-v" ) + git config --global --add safe.directory "${S}" || die + + if use compress-xz; then + FW_OPTIONS+=( "--xz" ) + elif use compress-zstd; then + FW_OPTIONS+=( "--zstd" ) + fi + FW_OPTIONS+=( "${ED}/lib/firmware" ) + ./copy-firmware.sh "${FW_OPTIONS[@]}" || die + use deduplicate && { ./dedup-firmware.sh "${ED}/lib/firmware" || die; } + # blacklist of images with unknown license local unknown_license=( korg/k1212.dsp @@ -263,41 +298,6 @@ src_prepare() { einfo "Removing files with unknown license ..." rm -v "${unknown_license[@]}" || die fi - - if use !redistributable; then - # remove files _not_ in the free_software or unknown_license lists - # everything else is confirmed (or assumed) to be redistributable - # based on upstream acceptance policy - einfo "Removing non-redistributable files ..." - local OLDIFS="${IFS}" - local IFS=$'\n' - set -o pipefail - find ! -type d -printf "%P\n" \ - | grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \ - | xargs -d '\n' --no-run-if-empty rm -v - - [[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files" - - IFS="${OLDIFS}" - fi - - restore_config ${PN}.conf -} - -src_install() { - - local FW_OPTIONS=( "-v" ) - git config --global --add safe.directory "${S}" || die - - if use compress-xz; then - FW_OPTIONS+=( "--xz" ) - elif use compress-zstd; then - FW_OPTIONS+=( "--zstd" ) - fi - FW_OPTIONS+=( "${ED}/lib/firmware" ) - ./copy-firmware.sh "${FW_OPTIONS[@]}" || die - use deduplicate && { ./dedup-firmware.sh "${ED}/lib/firmware" || die; } - pushd "${ED}/lib/firmware" &>/dev/null || die # especially use !redistributable will cause some broken symlinks @@ -379,6 +379,7 @@ pkg_preinst() { # Make sure /boot is available if needed. use initramfs && ! use dist-kernel && mount-boot_pkg_preinst + } pkg_postinst() { @@ -404,6 +405,8 @@ pkg_postinst() { mount-boot_pkg_postinst fi fi + + } pkg_prerm() {
