From d1c14e94a73fba924761cdad7298f3e48c6bc160 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 Jul 2024 08:00:51 +0100 Subject: gentoo auto-resync : 01:07:2024 - 08:00:50 --- sys-kernel/Manifest.gz | Bin 4736 -> 4739 bytes sys-kernel/git-sources/Manifest | 2 + sys-kernel/git-sources/git-sources-6.10_rc6.ebuild | 39 ++ sys-kernel/linux-firmware/Manifest | 3 +- .../linux-firmware-20240610-r2.ebuild | 396 +++++++++++++++++++++ .../linux-firmware/linux-firmware-99999999.ebuild | 44 +-- 6 files changed, 451 insertions(+), 33 deletions(-) create mode 100644 sys-kernel/git-sources/git-sources-6.10_rc6.ebuild create mode 100644 sys-kernel/linux-firmware/linux-firmware-20240610-r2.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz index 69a012d2ea88..d1d09f7c30e8 100644 Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest index 37c7bd56e88c..c00fcfa7dca6 100644 --- a/sys-kernel/git-sources/Manifest +++ b/sys-kernel/git-sources/Manifest @@ -4,9 +4,11 @@ DIST patch-6.10-rc2.patch 40951045 BLAKE2B 45e99646253a45e4030ca70103d789e87f9d8 DIST patch-6.10-rc3.patch 41282995 BLAKE2B b507c62020cb25bc3d7d7408222e018290c91689ffe27ffe89c082f2ed705b57e51d26f99613d80e6707adc2a1be7bf1909047122d5a9cbac973f2cd22f9d107 SHA512 4a5229973453c29fdbccc09f3cd015900ae457e5b1b3c5159256afdf30ff7644bdfe67724da90da7b9936308850725ae3c1066b71e966a695618593b0008e2bb DIST patch-6.10-rc4.patch 41531928 BLAKE2B a3945dbfd08a30ec82f8aeca668b2122be4d606ecc6d1a810bbc39d1eb0b69bedc9731cb98066eb8fd26447a8e6c57f7d523acdbed1f2a35be4a105f879c9f42 SHA512 efc88b09fe7cd5d54662a53aa94e9a6eb479f3e8de259903c8a4f7c9073cc9ef5dc16c2cc36c85296e35fca34758a93ceabcfe0600363c1a8b5383af8633ff55 DIST patch-6.10-rc5.patch 41852953 BLAKE2B cd1faa6d5e035eb135fddba971c7885c2e290a2369b8f82a74eda23aa7ee80ee0e3f62d9fa3b0105b9baf1f9da719be63756f6e29a49c9a07c6076608ba4b739 SHA512 3d9a0ee7c45172338692f111b3d5022d46eb26d2a9451f0a3fe730648cc4b3f0871dcebfa9b69670fe973eefb6beb15844e6476d264b35c9ea0e22641f364810 +DIST patch-6.10-rc6.patch 42201969 BLAKE2B 3d4e681c69432c9fe0e274732425ee4e5b01547fa15d9820c6ccc892b9686212117bf24614cf0f66b4f5f2cbed750a3d601a09d2e2bad8b69c3d191b1e0166b8 SHA512 e5b2eca573c6b24db12d791da30fce61441f25db91288e008d627d41c4827258fa83db2c5171c8aa30af2a020d6e06e2f0590fa93fb8360fdfd2c92e3775f646 EBUILD git-sources-6.10_rc1.ebuild 1173 BLAKE2B 9b0403eefac2dc76f07edb47d254621d573368241a1ef59393e121fa7ebc3300d1901d23b31443fabc7d4d6c519d0b06a01851be286d80943e82ec4c47338bf9 SHA512 d59e23f6485fd7a8f55b939a38c3d3466fd95b305235c4c9c087ec02c06a22906d88a5dcd0e9a814e0cba6c6a549c58f40d31180a579e654a8581d33a587ddea EBUILD git-sources-6.10_rc2.ebuild 1173 BLAKE2B 9b0403eefac2dc76f07edb47d254621d573368241a1ef59393e121fa7ebc3300d1901d23b31443fabc7d4d6c519d0b06a01851be286d80943e82ec4c47338bf9 SHA512 d59e23f6485fd7a8f55b939a38c3d3466fd95b305235c4c9c087ec02c06a22906d88a5dcd0e9a814e0cba6c6a549c58f40d31180a579e654a8581d33a587ddea EBUILD git-sources-6.10_rc3.ebuild 1173 BLAKE2B 9b0403eefac2dc76f07edb47d254621d573368241a1ef59393e121fa7ebc3300d1901d23b31443fabc7d4d6c519d0b06a01851be286d80943e82ec4c47338bf9 SHA512 d59e23f6485fd7a8f55b939a38c3d3466fd95b305235c4c9c087ec02c06a22906d88a5dcd0e9a814e0cba6c6a549c58f40d31180a579e654a8581d33a587ddea EBUILD git-sources-6.10_rc4.ebuild 1173 BLAKE2B 9b0403eefac2dc76f07edb47d254621d573368241a1ef59393e121fa7ebc3300d1901d23b31443fabc7d4d6c519d0b06a01851be286d80943e82ec4c47338bf9 SHA512 d59e23f6485fd7a8f55b939a38c3d3466fd95b305235c4c9c087ec02c06a22906d88a5dcd0e9a814e0cba6c6a549c58f40d31180a579e654a8581d33a587ddea EBUILD git-sources-6.10_rc5.ebuild 1173 BLAKE2B 9b0403eefac2dc76f07edb47d254621d573368241a1ef59393e121fa7ebc3300d1901d23b31443fabc7d4d6c519d0b06a01851be286d80943e82ec4c47338bf9 SHA512 d59e23f6485fd7a8f55b939a38c3d3466fd95b305235c4c9c087ec02c06a22906d88a5dcd0e9a814e0cba6c6a549c58f40d31180a579e654a8581d33a587ddea +EBUILD git-sources-6.10_rc6.ebuild 1173 BLAKE2B 9b0403eefac2dc76f07edb47d254621d573368241a1ef59393e121fa7ebc3300d1901d23b31443fabc7d4d6c519d0b06a01851be286d80943e82ec4c47338bf9 SHA512 d59e23f6485fd7a8f55b939a38c3d3466fd95b305235c4c9c087ec02c06a22906d88a5dcd0e9a814e0cba6c6a549c58f40d31180a579e654a8581d33a587ddea MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001 diff --git a/sys-kernel/git-sources/git-sources-6.10_rc6.ebuild b/sys-kernel/git-sources/git-sources-6.10_rc6.ebuild new file mode 100644 index 000000000000..edb1a477e11c --- /dev/null +++ b/sys-kernel/git-sources/git-sources-6.10_rc6.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +UNIPATCH_STRICTORDER="yes" +K_NOUSENAME="yes" +K_NOSETEXTRAVERSION="yes" +K_NOUSEPR="yes" +K_SECURITY_UNSUPPORTED="1" +K_BASE_VER="6.9" +K_EXP_GENPATCHES_NOUSE="1" +K_FROM_GIT="yes" +K_NODRYRUN="yes" +ETYPE="sources" +CKV="${PVR/-r/-git}" + +# only use this if it's not an _rc/_pre release +[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}" +inherit kernel-2 +detect_version + +DESCRIPTION="The very latest -git version of the Linux kernel" +HOMEPAGE="https://www.kernel.org" +SRC_URI="${KERNEL_URI}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86" + +K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and +experimental nature. If you have any issues, try a matching vanilla-sources +ebuild -- if the problem is not there, please contact the upstream kernel +developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to +report the problem so it can be fixed in time for the next kernel release." + +DEPEND="${RDEPEND} + >=sys-devel/patch-2.7.6-r4" + +pkg_postinst() { + postinst_sources +} diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index 80928da44404..a90deba08319 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -8,5 +8,6 @@ DIST linux-firmware-20240610.tar.xz 375519640 BLAKE2B 242dbd9d85eabeb8eeebbba86a EBUILD linux-firmware-20240410.ebuild 11701 BLAKE2B badc3af8bec613910d4595d9c19bd981b9d7bec7b668a6b620c93fe5327e4ea6e5dee74b9288d090be0e61c80e920cc7f19b4c7630da191781e35917610d3e48 SHA512 d82b20e52adacec96ac1a748e53d757d45ebac37e84ab152ad4285ee202d79d2befec4d7a2695a3119366683e6d143ce8b1311197afb180ee14f3e922d03121e EBUILD linux-firmware-20240513.ebuild 11701 BLAKE2B badc3af8bec613910d4595d9c19bd981b9d7bec7b668a6b620c93fe5327e4ea6e5dee74b9288d090be0e61c80e920cc7f19b4c7630da191781e35917610d3e48 SHA512 d82b20e52adacec96ac1a748e53d757d45ebac37e84ab152ad4285ee202d79d2befec4d7a2695a3119366683e6d143ce8b1311197afb180ee14f3e922d03121e EBUILD linux-firmware-20240610-r1.ebuild 11594 BLAKE2B b55a6cba54c649fef4ef1f1ef711a6cd5cee7f7b40326293d0ca3a6e6188ab9f87ccd316f67872d51a77e65e16cd080ae8d4890251b3464ab255120a95cb1c9f SHA512 ef5bd4c4853b0eb7c1d09210e5eaaa4a1dd8cd41486edcbe051a16a6b1d672e92231ba615066e8627b2df7bcfa557b45d889278f97cc366ec426bab698833c75 -EBUILD linux-firmware-99999999.ebuild 11749 BLAKE2B 43e35d0dd95cac657a1e466302c79d3ba8e35e7085c4f2a3fbaa44a22069a720783318e1bfc7e434de94e2056c30ae97324b35417f1d0364c77a1ff0af39ebee SHA512 f5e697ce8880c9d69c6fb8d48a9e722475cfd3f4c1bc7737fbf4ae321e6620fc27b82d5108ca09d80389ca37424cd1f8a1b590333c0bcaa869dadbc17a4d29de +EBUILD linux-firmware-20240610-r2.ebuild 10992 BLAKE2B dc1c7ae870ce8e8fc69181be65e780106e50c02a940f2a6a5f1f9066109e7d88994a857b31ab81027eea9c8be7f529a82a02c56d1256c32e7e89e30ae32863d8 SHA512 0e827ca4ac75e0cf67f176d8f1965a13b13ea2840d222858f774291abbe700607e81d79c0f98c5e88bb736d41e5c331f20a588517f6f411261ce6d563364eb06 +EBUILD linux-firmware-99999999.ebuild 11209 BLAKE2B 5dfd2dfac2b469f236dfa28b999a92d8594196f93fabd8a566d73f9a39cded131d3e36653fd0767587d4c66af7a429f0fab3f439a9a654bfbf6cbb8661c270f2 SHA512 97374322158ae8c531714a0c83236101113a2aff0f90684abca324b32f13821b9164ca693d19adbf90c55b291e2e1a210f5570f57ef5891cd36944661ca91a6d MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5 diff --git a/sys-kernel/linux-firmware/linux-firmware-20240610-r2.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240610-r2.ebuild new file mode 100644 index 000000000000..2b7db9344104 --- /dev/null +++ b/sys-kernel/linux-firmware/linux-firmware-20240610-r2.ebuild @@ -0,0 +1,396 @@ +# 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 + +# 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() { + if use initramfs; then + if [[ -z ${ROOT} ]] && use dist-kernel; then + # Check, but don't die because we can fix the problem and then + # emerge --config ... to re-run installation. + nonfatal mount-boot_check_status + else + mount-boot_pkg_pretend + fi + fi +} + +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 + + if use compress-xz; then + FW_OPTIONS+=( "--xz" ) + elif use compress-zstd; then + FW_OPTIONS+=( "--zstd" ) + fi + ! use deduplicate && FW_OPTIONS+=( "--ignore-duplicates" ) + FW_OPTIONS+=( "${ED}/lib/firmware" ) + ./copy-firmware.sh "${FW_OPTIONS[@]}" || die + + 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 + + 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 && ! use dist-kernel && 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 + + if use initramfs; then + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + else + # Don't forget to umount /boot if it was previously mounted by us. + mount-boot_pkg_postinst + fi + fi +} + +pkg_prerm() { + # Make sure /boot is mounted so that we can remove /boot/amd-uc.img! + use initramfs && ! use dist-kernel && mount-boot_pkg_prerm +} + +pkg_postrm() { + # Don't forget to umount /boot if it was previously mounted by us. + use initramfs && ! use dist-kernel && 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 cbf74c22e3a1..144bba36cba3 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit dist-kernel-utils linux-info mount-boot savedconfig multiprocessing +inherit dist-kernel-utils linux-info mount-boot savedconfig # In case this is a real snapshot, fill in commit below. # For normal, tagged releases, leave blank @@ -271,7 +271,17 @@ src_prepare() { } src_install() { - ./copy-firmware.sh $(usex deduplicate '' '--ignore-duplicates') -v "${ED}/lib/firmware" || die + + local FW_OPTIONS=( "-v" ) + + if use compress-xz; then + FW_OPTIONS+=( "--xz" ) + elif use compress-zstd; then + FW_OPTIONS+=( "--zstd" ) + fi + ! use deduplicate && FW_OPTIONS+=( "--ignore-duplicates" ) + FW_OPTIONS+=( "${ED}/lib/firmware" ) + ./copy-firmware.sh "${FW_OPTIONS[@]}" || die pushd "${ED}/lib/firmware" &>/dev/null || die @@ -317,36 +327,6 @@ src_install() { 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 -- cgit v1.2.3