From d855918b46ba8714cf1320fe63b55fd0ed1748a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Jun 2024 08:00:25 +0100 Subject: gentoo auto-resync : 29:06:2024 - 08:00:25 --- sys-kernel/Manifest.gz | Bin 4736 -> 4737 bytes sys-kernel/linux-firmware/Manifest | 7 +- .../files/35-amd-microcode-systemd.install | 35 ++ .../linux-firmware/files/35-amd-microcode.install | 39 ++ .../files/linux-firmware-make-amd-ucode-img.bash | 79 ++++ .../linux-firmware-20240610-r1.ebuild | 412 ++++++++++++++++++++ .../linux-firmware/linux-firmware-20240610.ebuild | 417 --------------------- .../linux-firmware/linux-firmware-99999999.ebuild | 32 +- 8 files changed, 584 insertions(+), 437 deletions(-) create mode 100644 sys-kernel/linux-firmware/files/35-amd-microcode-systemd.install create mode 100644 sys-kernel/linux-firmware/files/35-amd-microcode.install create mode 100644 sys-kernel/linux-firmware/files/linux-firmware-make-amd-ucode-img.bash create mode 100644 sys-kernel/linux-firmware/linux-firmware-20240610-r1.ebuild delete mode 100644 sys-kernel/linux-firmware/linux-firmware-20240610.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz index bd31b5a108a0..f202c9416781 100644 Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index 718d38314616..ea69ae02292b 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -1,9 +1,12 @@ +AUX 35-amd-microcode-systemd.install 1116 BLAKE2B 38a5e51491951ad5c378cb4ddb19144d0122557692b043155b716cb30867abfd9d4eb6efb98638c61bffbb8e14130328f93271ea1d65e91f031cbd66d124a126 SHA512 9dff35b10f3834ef9516f77a3fbd1b1411c0b2218ead50596e97fe27f140cae9c2305ad1e44c96d7e2d00d520a9f75e6644f951bf3d96403d00ef7d5055a14a1 +AUX 35-amd-microcode.install 1203 BLAKE2B 77a5d7f4ecfa5368cf01c187dd280193582a3245103013cd494eb70a568448b162928968e9388696cb86a65560a0c2aa516a83091006d2a830b139e16f946db8 SHA512 a857e8b2f3d450d0e02f55b2129412f79df650e8355b70a0162fd46784909a5bfb7a93a795eff8ca86b7b2a3254339e66149b25c0983b9587ca5b14e1449bcdf AUX linux-firmware-copy-firmware-r4.patch 1538 BLAKE2B 65712bb1b6ba0d4c2a04f2e202a4a9ee272aca364813825f568a6544b7b63537fc44a4304269fd323c9299f8dce4744414f8fe859958d5f9b52d57c9822615b4 SHA512 56694eb4ae6ec13093f1e3f86df9f5494109693f6456ed6d3ad2b2041deae0ce36e2919d256025f7442fcf0e966c0954ce4634c717e4e7cb68fc6d34ae5554f3 +AUX linux-firmware-make-amd-ucode-img.bash 2911 BLAKE2B 94586ef124310da2314655ebb517c71e3ac73ca636df3c534d4bd5de4ab175b5aa3d40bffe5c126e292a08cff677542df276660380d3b1f474326c9e456b2ee1 SHA512 21465fe141d5c58bb9a50653788f1084833b0a698aaca4b2dc589bd9129c9f3ee87f179791ef5dd8fda4182a48e378e0f83abbb452422b3462b8e81b57ca43a0 DIST linux-firmware-20240410.tar.xz 371871028 BLAKE2B 0201c38421bbbbeaa77590aeb71806111c20236d42c414b58a2f567889b3fe5136cc9fbfb20275d735ba5cb55fa6d01242014d6c94f75bd6e1bcf263e6661803 SHA512 fe6681e57ac3dfc29cdc0d6aec44a5aca5be6fc747e2ecd9334caaa55f1a713906d695cf56819f55dd6273f0bffef07de3d086020ad435b74119fe629ba31b32 DIST linux-firmware-20240513.tar.xz 371738300 BLAKE2B 9c73ee40c0e01b23a79fc3e13809a04837169c3ab1a72e19c99243e3586dab71f60ce15a936c64bdb16c77209692a285bf2439be88a05f010afe763bc67457b5 SHA512 681a63a71b89048e1b905d48f239bc6f8e6331b648b042d48c936292fd77dd542ff8b57c92ee8c0d6b3fbf9d74cce6588b6606a92db240ac8756d456a2136128 DIST linux-firmware-20240610.tar.xz 375519640 BLAKE2B 242dbd9d85eabeb8eeebbba86ae80633c412553f0eaac393b2792b99b0f0a8567db68d9c18e92be35809af9a3bf2cebd620c30d6fc518a312b19e8c8756316f9 SHA512 608d8fc12172e8461b66e9917f61ecb86e1c6b6fc260382e7382d61bbf08c1b0cc819207e93ac979a336b463b740c5ad7a7577b823caadb1c61606b7e070ddaf EBUILD linux-firmware-20240410.ebuild 11405 BLAKE2B 3864629836ffa560e23abb7f756ea7e3c87f66a1d82ea91317e9eaa21faf9c747f8ac97db014e3fd344ede613cac159aa914ad79b66beebfceb69c66bed8ab9d SHA512 1488329a8530f2681a7413b2c1512ccdf1af3b8584c3f0b6487f35b7062041e32aa50bdf8431c2ca0ecab82b9e1f9e26c434dc72eff6afe0225141f826e24b56 EBUILD linux-firmware-20240513.ebuild 11405 BLAKE2B 3864629836ffa560e23abb7f756ea7e3c87f66a1d82ea91317e9eaa21faf9c747f8ac97db014e3fd344ede613cac159aa914ad79b66beebfceb69c66bed8ab9d SHA512 1488329a8530f2681a7413b2c1512ccdf1af3b8584c3f0b6487f35b7062041e32aa50bdf8431c2ca0ecab82b9e1f9e26c434dc72eff6afe0225141f826e24b56 -EBUILD linux-firmware-20240610.ebuild 11405 BLAKE2B 3864629836ffa560e23abb7f756ea7e3c87f66a1d82ea91317e9eaa21faf9c747f8ac97db014e3fd344ede613cac159aa914ad79b66beebfceb69c66bed8ab9d SHA512 1488329a8530f2681a7413b2c1512ccdf1af3b8584c3f0b6487f35b7062041e32aa50bdf8431c2ca0ecab82b9e1f9e26c434dc72eff6afe0225141f826e24b56 -EBUILD linux-firmware-99999999.ebuild 11543 BLAKE2B 4cd452c4940508b4c8e423fd8afcb5b2f84e071b30023275d1ce7e3aec322ed6eb1426c624d166442ffdc7476e97a2d1cbf6f3913864f6f6d79bc9781ead91b7 SHA512 0362a877ca4864f206adb22b5a3cedd0fa8f22541d73d7dc6b42a2aac42c62bdbd2a44764b12f9d9f3c6afe99e0dd754a2ef8a8748bc2add3c31163fc442ffe0 +EBUILD linux-firmware-20240610-r1.ebuild 11298 BLAKE2B b369953b0ce80d5bf79d2063e595aea7b62ce258efb6a96b7f015dc2504b665f4d4ccd868285e2b5671db515b6fa68760774bb9a38e0d443a0b19f5437634bf5 SHA512 d4ff0d9dbecacc08f7f2a9214bd6788dc8eb76f2e414750ee5a2f896f92e71b34bea170806b15e45066d46495e2117a45efb4e2b6b0bf114a52a6fa89b531a26 +EBUILD linux-firmware-99999999.ebuild 11453 BLAKE2B 91e370c1465cb2b90f767ea426f2246f588f77b40dd6ac39eee4cf9249ace39c552f979927ca1f21c72ab3e453496494cd98a874dde11c276c8d5524f554f5e0 SHA512 b0074980f664e18bc0e1c9e2516570e27d93b76ed02729e2dff96d555f5ceca104d9f75d65e115b6a25758ab16f0affbcd133594b0da6d5b34919568852ced14 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5 diff --git a/sys-kernel/linux-firmware/files/35-amd-microcode-systemd.install b/sys-kernel/linux-firmware/files/35-amd-microcode-systemd.install new file mode 100644 index 000000000000..edafb4d63035 --- /dev/null +++ b/sys-kernel/linux-firmware/files/35-amd-microcode-systemd.install @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +# Copyright 2024 Gentoo Authors +# This script is installed by sys-kernel/linux-firmware, it is executed by +# systemd's kernel-install, NOT by the traditional installkernel. I.e. this +# plugin is run when the systemd USE flag is enabled or +# SYSTEMD_KERNEL_INSTALL=1 is set in the environment. + +COMMAND="${1}" + +if [[ ${COMMAND} != add ]]; then + exit 0 +fi + +if [[ ${KERNEL_INSTALL_INITRD_GENERATOR} == dracut ]]; then + # Dracut bundles microcode in its initramfs images + [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]] && echo \ + "initrd_generator=${KERNEL_INSTALL_INITRD_GENERATOR} bundles CPU microcode, nothing to do here." + exit 0 +fi + +# do nothing if somehow make-amd-ucode-img is not installed +if ! command -v make-amd-ucode-img >/dev/null; then + [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]] && echo \ + "make-amd-ucode-img command not available" + exit 1 +fi + +[[ ${KERNEL_INSTALL_VERBOSE} == 1 ]] && echo \ + "Generating AMD CPU Microcode early initramfs image..." + +make-amd-ucode-img \ + ${KERNEL_INSTALL_STAGING_AREA}/microcode-amd \ + /lib/firmware/amd-ucode || + { echo "make-amd-ucode-img failed" && exit 1; } diff --git a/sys-kernel/linux-firmware/files/35-amd-microcode.install b/sys-kernel/linux-firmware/files/35-amd-microcode.install new file mode 100644 index 000000000000..185e57be0dae --- /dev/null +++ b/sys-kernel/linux-firmware/files/35-amd-microcode.install @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +# Copyright 2024 Gentoo Authors +# This script is installed by sys-kernel/linux-firmware, it is executed by +# the traditional installkernel, NOT by systemd's kernel-install. I.e. this +# plugin is run when the systemd USE flag is disabled or +# SYSTEMD_KERNEL_INSTALL=0 is set in the environment. + +# familiar helpers, we intentionally don't use Gentoo functions.sh +die() { + echo -e " ${NOCOLOR-\e[1;31m*\e[0m }${*}" >&2 + exit 1 +} + +einfo() { + echo -e " ${NOCOLOR-\e[1;32m*\e[0m }${*}" >&2 +} + +main() { + # re-define for subst to work + [[ -n ${NOCOLOR+yes} ]] && NOCOLOR= + + if [[ ${INSTALLKERNEL_INITRD_GENERATOR} == dracut ]]; then + # Dracut bundles microcode in its initramfs images + echo "initrd_generator=${INSTALLKERNEL_INITRD_GENERATOR} bundles CPU microcode, nothing to do here." + exit 0 + fi + + # do nothing if somehow make-amd-ucode-img is not installed + [[ -x $(command -v make-amd-ucode-img) ]] || die "make-amd-ucode-img command not available" + + [[ ${EUID} -eq 0 ]] || die "Please run this script as root" + + einfo "Generating AMD CPU Microcode early initramfs image..." + make-amd-ucode-img /boot/amd-uc.img /lib/firmware/amd-ucode || + die "make-amd-ucode-img failed" +} + +main diff --git a/sys-kernel/linux-firmware/files/linux-firmware-make-amd-ucode-img.bash b/sys-kernel/linux-firmware/files/linux-firmware-make-amd-ucode-img.bash new file mode 100644 index 000000000000..5fac567e063d --- /dev/null +++ b/sys-kernel/linux-firmware/files/linux-firmware-make-amd-ucode-img.bash @@ -0,0 +1,79 @@ +#!/usr/bin/env bash + +# Copyright 2024 Gentoo Authors + +our_name=${0} +out=${1} +in=${2} + +# familiar helpers, we intentionally don't use Gentoo functions.sh +die() { + echo -e " ${NOCOLOR-\e[1;31m*\e[0m }${*}" >&2 + exit 1 +} + +einfo() { + echo -e " ${NOCOLOR-\e[1;32m*\e[0m }${*}" >&2 +} + +main() { + # re-define for subst to work + [[ -n ${NOCOLOR+yes} ]] && NOCOLOR= + + + # Set the output file to arg 1 if it's not a directory. + # If it's a directory, set the out file to the directory with the default name. + # If it's a relative filename, include it in the variable. + local ucode_file=${out:-"/boot/amd-uc.img"} + if [[ -d ${ucode_file} ]]; then + ucode_file="${ucode_file}/amd-uc.img" + einfo "Output file is a directory. Using default name: ${ucode_file}" + elif [[ ${ucode_file} != /* ]]; then + ucode_file="$(pwd)/${ucode_file}" + einfo "Output file is a relative path. Using full path: ${ucode_file}" + elif [[ -z ${ucode_file} ]]; then + einfo "Usage: ${our_name} " + die "No output file specified" + fi + + # Only AMD microcode is in the linux-firmmware package + local ucode_dir=${in:-"/lib/firmware/amd-ucode"} + if [[ ! -d ${ucode_dir} ]]; then + einfo "Usage: ${our_name} " + die "AMD microcode directory does not exist: ${ucode_dir}" + fi + + # Make the tmp dir for the microcode archive + local ucode_tmp_dir="$(mktemp -d)" || die "Failed to create temporary directory" + einfo "Created temporary directory: ${ucode_tmp_dir}" + local ucode_bin_dir="${ucode_tmp_dir}/kernel/x86/microcode" + local ucode_bin_file="${ucode_bin_dir}/AuthenticAMD.bin" + + # Write "1" to the early_cpio flag file + echo 1 > "${ucode_tmp_dir}/early_cpio" || die + + # Make the directory for the microcode bin files + mkdir -p "${ucode_bin_dir}" || die "Failed to create microcode bin directory: ${ucode_bin_dir}" + + # Concatenate all microcode bin files into a single file + cat "${ucode_dir}"/*.bin > "${ucode_bin_file}" || die "Failed to concatenate microcode files into: ${ucode_bin_file}" + + # Check that the concatenated file is not empty + [[ -s "${ucode_bin_file}" ]] || die "Empty microcode file: ${ucode_bin_file}" + + pushd "${ucode_tmp_dir}" &> /dev/null || die + # Create the cpio archive + find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${ucode_file}" || die "Failed to create microcode archive in: ${ucode_file}" + popd &> /dev/null || die + + # Check that the cpio archive is not empty + [[ -s "${ucode_file}" ]] || die "Empty microcode archive at: ${ucode_file}" + + einfo "Created microcode archive at: ${ucode_file}" + # Clean up the tmp dir + rm -r "${ucode_tmp_dir}" || die "Failed to remove temporary directory: ${ucode_tmp_dir}" + einfo "Cleaned up temporary directory: ${ucode_tmp_dir}" +} + +main + diff --git a/sys-kernel/linux-firmware/linux-firmware-20240610-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240610-r1.ebuild new file mode 100644 index 000000000000..32bd327957ea --- /dev/null +++ b/sys-kernel/linux-firmware/linux-firmware-20240610-r1.ebuild @@ -0,0 +1,412 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit dist-kernel-utils linux-info mount-boot savedconfig multiprocessing + +# In case this is a real snapshot, fill in commit below. +# For normal, tagged releases, leave blank +MY_COMMIT="" + +if [[ ${PV} == 99999999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" +else + if [[ -n "${MY_COMMIT}" ]]; then + SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${MY_COMMIT}" + else + SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz" + fi + + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +DESCRIPTION="Linux firmware files" +HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git" + +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="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license" +REQUIRED_USE="initramfs? ( redistributable ) + ?? ( compress-xz compress-zstd ) + savedconfig? ( !deduplicate )" + +RESTRICT="binchecks strip test + !bindist? ( bindist ) + unknown-license? ( bindist )" + +BDEPEND="initramfs? ( app-alternatives/cpio ) + compress-xz? ( app-arch/xz-utils ) + compress-zstd? ( app-arch/zstd ) + deduplicate? ( app-misc/rdfind )" + +#add anything else that collides to this +RDEPEND="!savedconfig? ( + redistributable? ( + !sys-firmware/alsa-firmware[alsa_cards_ca0132] + !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] + ) + ) + dist-kernel? ( virtual/dist-kernel ) +" +IDEPEND=" + dist-kernel? ( + initramfs? ( sys-kernel/installkernel ) + ) +" + +QA_PREBUILT="*" +PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.patch ) + +pkg_pretend() { + use initramfs && mount-boot_pkg_pretend +} + +pkg_setup() { + if use compress-xz || use compress-zstd ; then + local CONFIG_CHECK + + if kernel_is -ge 5 19; then + use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ" + use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD" + else + use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS" + if use compress-zstd; then + eerror "Kernels <5.19 do not support ZSTD-compressed firmware files" + fi + fi + fi + linux-info_pkg_setup +} + +src_unpack() { + if [[ ${PV} == 99999999* ]]; then + git-r3_src_unpack + else + default + # rename directory from git snapshot tarball + if [[ ${#GIT_COMMIT} -gt 8 ]]; then + mv ${PN}-*/ ${P} || die + fi + fi +} + +src_prepare() { + default + + find . -type f -not -perm 0644 -print0 \ + | xargs --null --no-run-if-empty chmod 0644 \ + || die + + chmod +x copy-firmware.sh || die + cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die + chmod +x "${T}/make-amd-ucode-img" || die + + if use initramfs && ! use dist-kernel; then + if [[ -d "${S}/amd-ucode" ]]; then + "${T}/make-amd-ucode-img" "${S}" "${S}/amd-ucode" || die + else + # If this will ever happen something has changed which + # must be reviewed + die "'${S}/amd-ucode' not found!" + fi + fi + + # whitelist of misc files + local misc_files=( + copy-firmware.sh + README.md + WHENCE + LICEN[CS]E.* + ) + + # whitelist of images with a free software license + local free_software=( + # keyspan_pda (GPL-2+) + keyspan_pda/keyspan_pda.fw + keyspan_pda/xircom_pgs.fw + # dsp56k (GPL-2+) + dsp56k/bootstrap.bin + # ath9k_htc (BSD GPL-2+ MIT) + ath9k_htc/htc_7010-1.4.0.fw + ath9k_htc/htc_9271-1.4.0.fw + # pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1) + cis/LA-PCM.cis + cis/PCMLM28.cis + cis/DP83903.cis + cis/NE2K.cis + cis/tamarack.cis + cis/PE-200.cis + cis/PE520.cis + cis/3CXEM556.cis + cis/3CCFEM556.cis + cis/MT5634ZLX.cis + cis/RS-COM-2P.cis + cis/COMpad2.cis + cis/COMpad4.cis + # serial_cs (GPL-3) + cis/SW_555_SER.cis + cis/SW_7xx_SER.cis + cis/SW_8xx_SER.cis + # dvb-ttpci (GPL-2+) + av7110/bootcode.bin + # usbdux, usbduxfast, usbduxsigma (GPL-2+) + usbdux_firmware.bin + usbduxfast_firmware.bin + usbduxsigma_firmware.bin + # brcmfmac (GPL-2+) + brcm/brcmfmac4330-sdio.Prowise-PT301.txt + brcm/brcmfmac43340-sdio.meegopad-t08.txt + brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt + brcm/brcmfmac43362-sdio.lemaker,bananapro.txt + brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt + "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt" + brcm/brcmfmac43430-sdio.AP6212.txt + brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt + brcm/brcmfmac43430-sdio.MUR1DX.txt + brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt + brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt + brcm/brcmfmac4356-pcie.gpd-win-pocket.txt + # isci (GPL-2) + isci/isci_firmware.bin + # carl9170 (GPL-2+) + carl9170-1.fw + # atusb (GPL-2+) + atusb/atusb-0.2.dfu + atusb/atusb-0.3.dfu + atusb/rzusb-0.3.bin + # mlxsw_spectrum (dual BSD/GPL-2) + mellanox/mlxsw_spectrum-13.1420.122.mfa2 + mellanox/mlxsw_spectrum-13.1530.152.mfa2 + mellanox/mlxsw_spectrum-13.1620.192.mfa2 + mellanox/mlxsw_spectrum-13.1702.6.mfa2 + mellanox/mlxsw_spectrum-13.1703.4.mfa2 + mellanox/mlxsw_spectrum-13.1910.622.mfa2 + mellanox/mlxsw_spectrum-13.2000.1122.mfa2 + ) + + # blacklist of images with unknown license + local unknown_license=( + korg/k1212.dsp + ess/maestro3_assp_kernel.fw + ess/maestro3_assp_minisrc.fw + yamaha/ds1_ctrl.fw + yamaha/ds1_dsp.fw + yamaha/ds1e_ctrl.fw + ttusb-budget/dspbootcode.bin + emi62/bitstream.fw + emi62/loader.fw + emi62/midi.fw + emi62/spdif.fw + ti_3410.fw + ti_5052.fw + mts_mt9234mu.fw + mts_mt9234zba.fw + whiteheat.fw + whiteheat_loader.fw + cpia2/stv0672_vp4.bin + vicam/firmware.fw + edgeport/boot.fw + edgeport/boot2.fw + edgeport/down.fw + edgeport/down2.fw + edgeport/down3.bin + sb16/mulaw_main.csp + sb16/alaw_main.csp + sb16/ima_adpcm_init.csp + sb16/ima_adpcm_playback.csp + sb16/ima_adpcm_capture.csp + sun/cassini.bin + acenic/tg1.bin + acenic/tg2.bin + adaptec/starfire_rx.bin + adaptec/starfire_tx.bin + yam/1200.bin + yam/9600.bin + ositech/Xilinx7OD.bin + qlogic/isp1000.bin + myricom/lanai.bin + yamaha/yss225_registers.bin + lgs8g75.fw + ) + + if use !unknown-license; then + 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" ) + local files_to_keep= + + if use savedconfig; then + if [[ -s "${S}/${PN}.conf" ]]; then + files_to_keep="${T}/files_to_keep.lst" + grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die + [[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?" + FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" ) + fi + fi + + ! use deduplicate && FW_OPTIONS+=( "--ignore-duplicates" ) + FW_OPTIONS+=( "${ED}/lib/firmware" ) + ./copy-firmware.sh "${FW_OPTIONS[@]}" + + pushd "${ED}/lib/firmware" &>/dev/null || die + + # especially use !redistributable will cause some broken symlinks + einfo "Removing broken symlinks ..." + find * -xtype l -print -delete || die + + # remove empty directories, bug #396073 + find -type d -empty -delete || die + + # sanity check + if ! ( shopt -s failglob; : * ) 2>/dev/null; then + eerror "No files to install. Check your USE flag settings" + eerror "and the list of files in your saved configuration." + die "Refusing to install an empty package" + fi + + # create config file + echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die + find * ! -type d >> "${S}"/${PN}.conf || die + save_config "${S}"/${PN}.conf + + if use compress-xz || use compress-zstd; then + einfo "Compressing firmware ..." + local target + local ext + local compressor + + if use compress-xz; then + ext=xz + compressor="xz -T1 -C crc32" + elif use compress-zstd; then + ext=zst + compressor="zstd -15 -T1 -C -q --rm" + fi + + # rename symlinks + while IFS= read -r -d '' f; do + # skip symlinks pointing to directories + [[ -d ${f} ]] && continue + + target=$(readlink "${f}") + [[ $? -eq 0 ]] || die + ln -sf "${target}".${ext} "${f}" || die + mv -T "${f}" "${f}".${ext} || die + done < <(find . -type l -print0) || die + + find . -type f ! -path "./amd-ucode/*" -print0 | \ + xargs -0 -P $(makeopts_jobs) -I'{}' ${compressor} '{}' || die + + fi + + popd &>/dev/null || die + + # Instruct Dracut on whether or not we want the microcode in initramfs + ( + insinto /usr/lib/dracut/dracut.conf.d + newins - 10-${PN}.conf <<<"early_microcode=$(usex initramfs)" + ) + if use initramfs; then + # Install installkernel/kernel-install hooks for non-dracut initramfs + # generators that don't bundled the microcode + dobin "${T}/make-amd-ucode-img" + ( + exeinto /usr/lib/kernel/preinst.d + doexe "${FILESDIR}/35-amd-microcode.install" + exeinto /usr/lib/kernel/install.d + doexe "${FILESDIR}/35-amd-microcode-systemd.install" + ) + fi + + if use initramfs && ! use dist-kernel; then + insinto /boot + doins "${S}"/amd-uc.img + fi + + dodoc README.md + # some licenses require copyright and permission notice to be included + use bindist && dodoc WHENCE LICEN[CS]E.* +} + +pkg_preinst() { + if use savedconfig; then + ewarn "USE=savedconfig is active. You must handle file collisions manually." + fi + + # Fix 'symlink is blocked by a directory' Bug #871315 + if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then + rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX + fi + + # Make sure /boot is available if needed. + use initramfs && mount-boot_pkg_preinst +} + +pkg_postinst() { + elog "If you are only interested in particular firmware files, edit the saved" + elog "configfile and remove those that you do not want." + + local ver + for ver in ${REPLACING_VERSIONS}; do + if ver_test ${ver} -lt 20190514; then + elog + elog 'Starting with version 20190514, installation of many firmware' + elog 'files is controlled by USE flags. Please review your USE flag' + elog 'and package.license settings if you are missing some files.' + break + fi + done + + # Don't forget to umount /boot if it was previously mounted by us. + if use initramfs; then + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + mount-boot_pkg_postinst + fi +} + +pkg_prerm() { + # Make sure /boot is mounted so that we can remove /boot/amd-uc.img! + use initramfs && mount-boot_pkg_prerm +} + +pkg_postrm() { + # Don't forget to umount /boot if it was previously mounted by us. + use initramfs && mount-boot_pkg_postrm +} diff --git a/sys-kernel/linux-firmware/linux-firmware-20240610.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240610.ebuild deleted file mode 100644 index 1bb6954d00c8..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20240610.ebuild +++ /dev/null @@ -1,417 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit dist-kernel-utils linux-info mount-boot savedconfig multiprocessing - -# In case this is a real snapshot, fill in commit below. -# For normal, tagged releases, leave blank -MY_COMMIT="" - -if [[ ${PV} == 99999999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git" -else - if [[ -n "${MY_COMMIT}" ]]; then - SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${MY_COMMIT}" - else - SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz" - fi - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -DESCRIPTION="Linux firmware files" -HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git" - -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="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license" -REQUIRED_USE="initramfs? ( redistributable ) - ?? ( compress-xz compress-zstd ) - savedconfig? ( !deduplicate )" - -RESTRICT="binchecks strip test - !bindist? ( bindist ) - unknown-license? ( bindist )" - -BDEPEND="initramfs? ( app-alternatives/cpio ) - compress-xz? ( app-arch/xz-utils ) - compress-zstd? ( app-arch/zstd ) - deduplicate? ( app-misc/rdfind )" - -#add anything else that collides to this -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !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] - ) - ) - dist-kernel? ( virtual/dist-kernel ) -" -IDEPEND=" - dist-kernel? ( - initramfs? ( sys-kernel/installkernel ) - ) -" - -QA_PREBUILT="*" -PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.patch ) - -pkg_pretend() { - use initramfs && mount-boot_pkg_pretend -} - -pkg_setup() { - if use compress-xz || use compress-zstd ; then - local CONFIG_CHECK - - if kernel_is -ge 5 19; then - use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS_XZ" - use compress-zstd && CONFIG_CHECK="~FW_LOADER_COMPRESS_ZSTD" - else - use compress-xz && CONFIG_CHECK="~FW_LOADER_COMPRESS" - if use compress-zstd; then - eerror "Kernels <5.19 do not support ZSTD-compressed firmware files" - fi - fi - fi - linux-info_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 99999999* ]]; then - git-r3_src_unpack - else - default - # rename directory from git snapshot tarball - if [[ ${#GIT_COMMIT} -gt 8 ]]; then - mv ${PN}-*/ ${P} || die - fi - fi -} - -src_prepare() { - - default - - find . -type f -not -perm 0644 -print0 \ - | xargs --null --no-run-if-empty chmod 0644 \ - || die - - chmod +x copy-firmware.sh || die - - if use initramfs && ! use dist-kernel; then - if [[ -d "${S}/amd-ucode" ]]; then - local UCODETMP="${T}/ucode_tmp" - local UCODEDIR="${UCODETMP}/kernel/x86/microcode" - mkdir -p "${UCODEDIR}" || die - echo 1 > "${UCODETMP}/early_cpio" - - local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin" - cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode" - - if [[ ! -s "${amd_ucode_file}" ]]; then - die "Sanity check failed: '${amd_ucode_file}' is empty!" - fi - - pushd "${UCODETMP}" &>/dev/null || die - find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img - popd &>/dev/null || die - if [[ ! -s "${S}/amd-uc.img" ]]; then - die "Failed to create '${S}/amd-uc.img'!" - fi - else - # If this will ever happen something has changed which - # must be reviewed - die "'${S}/amd-ucode' not found!" - fi - fi - - # whitelist of misc files - local misc_files=( - copy-firmware.sh - README.md - WHENCE - LICEN[CS]E.* - ) - - # whitelist of images with a free software license - local free_software=( - # keyspan_pda (GPL-2+) - keyspan_pda/keyspan_pda.fw - keyspan_pda/xircom_pgs.fw - # dsp56k (GPL-2+) - dsp56k/bootstrap.bin - # ath9k_htc (BSD GPL-2+ MIT) - ath9k_htc/htc_7010-1.4.0.fw - ath9k_htc/htc_9271-1.4.0.fw - # pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1) - cis/LA-PCM.cis - cis/PCMLM28.cis - cis/DP83903.cis - cis/NE2K.cis - cis/tamarack.cis - cis/PE-200.cis - cis/PE520.cis - cis/3CXEM556.cis - cis/3CCFEM556.cis - cis/MT5634ZLX.cis - cis/RS-COM-2P.cis - cis/COMpad2.cis - cis/COMpad4.cis - # serial_cs (GPL-3) - cis/SW_555_SER.cis - cis/SW_7xx_SER.cis - cis/SW_8xx_SER.cis - # dvb-ttpci (GPL-2+) - av7110/bootcode.bin - # usbdux, usbduxfast, usbduxsigma (GPL-2+) - usbdux_firmware.bin - usbduxfast_firmware.bin - usbduxsigma_firmware.bin - # brcmfmac (GPL-2+) - brcm/brcmfmac4330-sdio.Prowise-PT301.txt - brcm/brcmfmac43340-sdio.meegopad-t08.txt - brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt - brcm/brcmfmac43362-sdio.lemaker,bananapro.txt - brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt - "brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt" - brcm/brcmfmac43430-sdio.AP6212.txt - brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt - brcm/brcmfmac43430-sdio.MUR1DX.txt - brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - brcm/brcmfmac4356-pcie.gpd-win-pocket.txt - # isci (GPL-2) - isci/isci_firmware.bin - # carl9170 (GPL-2+) - carl9170-1.fw - # atusb (GPL-2+) - atusb/atusb-0.2.dfu - atusb/atusb-0.3.dfu - atusb/rzusb-0.3.bin - # mlxsw_spectrum (dual BSD/GPL-2) - mellanox/mlxsw_spectrum-13.1420.122.mfa2 - mellanox/mlxsw_spectrum-13.1530.152.mfa2 - mellanox/mlxsw_spectrum-13.1620.192.mfa2 - mellanox/mlxsw_spectrum-13.1702.6.mfa2 - mellanox/mlxsw_spectrum-13.1703.4.mfa2 - mellanox/mlxsw_spectrum-13.1910.622.mfa2 - mellanox/mlxsw_spectrum-13.2000.1122.mfa2 - ) - - # blacklist of images with unknown license - local unknown_license=( - korg/k1212.dsp - ess/maestro3_assp_kernel.fw - ess/maestro3_assp_minisrc.fw - yamaha/ds1_ctrl.fw - yamaha/ds1_dsp.fw - yamaha/ds1e_ctrl.fw - ttusb-budget/dspbootcode.bin - emi62/bitstream.fw - emi62/loader.fw - emi62/midi.fw - emi62/spdif.fw - ti_3410.fw - ti_5052.fw - mts_mt9234mu.fw - mts_mt9234zba.fw - whiteheat.fw - whiteheat_loader.fw - cpia2/stv0672_vp4.bin - vicam/firmware.fw - edgeport/boot.fw - edgeport/boot2.fw - edgeport/down.fw - edgeport/down2.fw - edgeport/down3.bin - sb16/mulaw_main.csp - sb16/alaw_main.csp - sb16/ima_adpcm_init.csp - sb16/ima_adpcm_playback.csp - sb16/ima_adpcm_capture.csp - sun/cassini.bin - acenic/tg1.bin - acenic/tg2.bin - adaptec/starfire_rx.bin - adaptec/starfire_tx.bin - yam/1200.bin - yam/9600.bin - ositech/Xilinx7OD.bin - qlogic/isp1000.bin - myricom/lanai.bin - yamaha/yss225_registers.bin - lgs8g75.fw - ) - - if use !unknown-license; then - 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" ) - local files_to_keep= - - if use savedconfig; then - if [[ -s "${S}/${PN}.conf" ]]; then - files_to_keep="${T}/files_to_keep.lst" - grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die - [[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?" - FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" ) - fi - fi - - ! use deduplicate && FW_OPTIONS+=( "--ignore-duplicates" ) - FW_OPTIONS+=( "${ED}/lib/firmware" ) - ./copy-firmware.sh "${FW_OPTIONS[@]}" - - pushd "${ED}/lib/firmware" &>/dev/null || die - - # especially use !redistributable will cause some broken symlinks - einfo "Removing broken symlinks ..." - find * -xtype l -print -delete || die - - # remove empty directories, bug #396073 - find -type d -empty -delete || die - - # sanity check - if ! ( shopt -s failglob; : * ) 2>/dev/null; then - eerror "No files to install. Check your USE flag settings" - eerror "and the list of files in your saved configuration." - die "Refusing to install an empty package" - fi - - # create config file - echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die - find * ! -type d >> "${S}"/${PN}.conf || die - save_config "${S}"/${PN}.conf - - if use compress-xz || use compress-zstd; then - einfo "Compressing firmware ..." - local target - local ext - local compressor - - if use compress-xz; then - ext=xz - compressor="xz -T1 -C crc32" - elif use compress-zstd; then - ext=zst - compressor="zstd -15 -T1 -C -q --rm" - fi - - # rename symlinks - while IFS= read -r -d '' f; do - # skip symlinks pointing to directories - [[ -d ${f} ]] && continue - - target=$(readlink "${f}") - [[ $? -eq 0 ]] || die - ln -sf "${target}".${ext} "${f}" || die - mv -T "${f}" "${f}".${ext} || die - done < <(find . -type l -print0) || die - - find . -type f ! -path "./amd-ucode/*" -print0 | \ - xargs -0 -P $(makeopts_jobs) -I'{}' ${compressor} '{}' || die - - fi - - popd &>/dev/null || die - - # Instruct Dracut on whether or not we want the microcode in initramfs - ( - insinto /usr/lib/dracut/dracut.conf.d - newins - 10-${PN}.conf <<<"early_microcode=$(usex initramfs)" - ) - - if use initramfs && ! use dist-kernel; then - insinto /boot - doins "${S}"/amd-uc.img - fi - - dodoc README.md - # some licenses require copyright and permission notice to be included - use bindist && dodoc WHENCE LICEN[CS]E.* -} - -pkg_preinst() { - if use savedconfig; then - ewarn "USE=savedconfig is active. You must handle file collisions manually." - fi - - # Fix 'symlink is blocked by a directory' Bug #871315 - if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then - rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX - fi - - # Make sure /boot is available if needed. - use initramfs && mount-boot_pkg_preinst -} - -pkg_postinst() { - elog "If you are only interested in particular firmware files, edit the saved" - elog "configfile and remove those that you do not want." - - local ver - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt 20190514; then - elog - elog 'Starting with version 20190514, installation of many firmware' - elog 'files is controlled by USE flags. Please review your USE flag' - elog 'and package.license settings if you are missing some files.' - break - fi - done - - # Don't forget to umount /boot if it was previously mounted by us. - if use initramfs; then - if [[ -z ${ROOT} ]] && use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - mount-boot_pkg_postinst - fi -} - -pkg_prerm() { - # Make sure /boot is mounted so that we can remove /boot/amd-uc.img! - use initramfs && mount-boot_pkg_prerm -} - -pkg_postrm() { - # Don't forget to umount /boot if it was previously mounted by us. - use initramfs && mount-boot_pkg_postrm -} diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index dc02d051d7ea..26c21e80395e 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -107,27 +107,12 @@ src_prepare() { || die chmod +x copy-firmware.sh || die + cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die + chmod +x "${T}/make-amd-ucode-img" || die if use initramfs && ! use dist-kernel; then if [[ -d "${S}/amd-ucode" ]]; then - local UCODETMP="${T}/ucode_tmp" - local UCODEDIR="${UCODETMP}/kernel/x86/microcode" - mkdir -p "${UCODEDIR}" || die - echo 1 > "${UCODETMP}/early_cpio" - - local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin" - cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode" - - if [[ ! -s "${amd_ucode_file}" ]]; then - die "Sanity check failed: '${amd_ucode_file}' is empty!" - fi - - pushd "${UCODETMP}" &>/dev/null || die - find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img - popd &>/dev/null || die - if [[ ! -s "${S}/amd-uc.img" ]]; then - die "Failed to create '${S}/amd-uc.img'!" - fi + ."/${T}/make-amd-ucode-img" "${S}/amd-ucode" "${S}/amd-ucode.img" || die else # If this will ever happen something has changed which # must be reviewed @@ -361,6 +346,17 @@ src_install() { insinto /usr/lib/dracut/dracut.conf.d newins - 10-${PN}.conf <<<"early_microcode=$(usex initramfs)" ) + if use initramfs; then + # Install installkernel/kernel-install hooks for non-dracut initramfs + # generators that don't bundled the microcode + dobin "${T}/make-amd-ucode-img" + ( + exeinto /usr/lib/kernel/preinst.d + doexe "${FILESDIR}/35-amd-microcode.install" + exeinto /usr/lib/kernel/install.d + doexe "${FILESDIR}/35-amd-microcode-systemd.install" + ) + fi if use initramfs && ! use dist-kernel; then insinto /boot -- cgit v1.2.3