From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6A89F15838C for ; Thu, 18 Jan 2024 19:03:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B25052BC040; Thu, 18 Jan 2024 19:03:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 963E42BC040 for ; Thu, 18 Jan 2024 19:03:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB94C3433B0 for ; Thu, 18 Jan 2024 19:03:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4604B11F4 for ; Thu, 18 Jan 2024 19:03:12 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1705604581.e3a5c6f637729295b7390dcdfef73ad189d37a60.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/linux-firmware/Manifest sys-kernel/linux-firmware/linux-firmware-20231030.ebuild X-VCS-Directories: sys-kernel/linux-firmware/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: e3a5c6f637729295b7390dcdfef73ad189d37a60 X-VCS-Branch: master Date: Thu, 18 Jan 2024 19:03:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c8e53526-7b3d-4d6f-820a-cacd45b7af41 X-Archives-Hash: 7b12e9d407757441634fe67d1f3d18f8 commit: e3a5c6f637729295b7390dcdfef73ad189d37a60 Author: Mike Pagano gentoo org> AuthorDate: Thu Jan 18 19:03:01 2024 +0000 Commit: Mike Pagano gentoo org> CommitDate: Thu Jan 18 19:03:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a5c6f6 sys-kernel/linux-firmware: drop 20231030 Signed-off-by: Mike Pagano gentoo.org> sys-kernel/linux-firmware/Manifest | 1 - .../linux-firmware/linux-firmware-20231030.ebuild | 403 --------------------- 2 files changed, 404 deletions(-) diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index d4d14ab93aaa..499641cc7381 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -1,4 +1,3 @@ -DIST linux-firmware-20231030.tar.xz 317290700 BLAKE2B 3f2f7cd177adabba683d98f048d0fb24f6872168e0a7a43b4521fd43970428af881e54093cc247cf394f714a845db2c0d85387d93305dd1b2c08b359c1f0abb8 SHA512 0a747df0ac6fe1577578021d394b94a5db517b368b17d14a3a580bb361f5112b293ee2f9c56f51b0471118fcc3983c037afea702028370b95715bc9d06672191 DIST linux-firmware-20231111.tar.xz 356057052 BLAKE2B f594a14e9d7d824f2d7b3c85dd760ecab2f9a72f67e3904774d6bf99906695d2ca48c17cf4c44ebd0d9adbb98c3353ddb5e39cd48f93499539d02b8fb54b2db4 SHA512 dd8eb7e8a51fe14479e2f4e1081a8a31f13d041ddd6180eaae6fe865dbad303c89aaaed2b9df237923f74f1cf9fe8c2e5492b4de5fce991ddb02bb091c95dc58 DIST linux-firmware-20231211.tar.xz 358100480 BLAKE2B 91b9ef2d244d465e8d62d2c529f3481b1e28a9c30a143ef7d9f2fb3a2a0f9d7e96b64f09f09fcf73c93ffae693774e03134ce97575610b5c728794ff55224265 SHA512 571eb540d7994eec1a94b7eede8dd225a3ad2a7209018e32086b47d5758c9ce5ff751b15c843176a9b50ae6455445a18871c736e291ae745b402c0254a4f63a7 DIST linux-firmware-20240115.tar.xz 363994604 BLAKE2B 00a0874cfbafe0fe57a841510c71e54e836efad65564b7fa30c334c2bcf909e235129035a6fa4ba090089492fb07beab945be82b3801ce8353fca20fa426ac85 SHA512 65100216a0dbe97ea0cdf3104dd59c95cafe883bd8c2a40f9369acb55d6f7260c1b51f233987d2f89cce93b2a952721a0484a6314cda49455986c597ff2050dd diff --git a/sys-kernel/linux-firmware/linux-firmware-20231030.ebuild b/sys-kernel/linux-firmware/linux-firmware-20231030.ebuild deleted file mode 100644 index 54bb6c081f19..000000000000 --- a/sys-kernel/linux-firmware/linux-firmware-20231030.ebuild +++ /dev/null @@ -1,403 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit 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="compress-xz compress-zstd initramfs +redistributable savedconfig unknown-license" -REQUIRED_USE="initramfs? ( redistributable ) - ?? ( compress-xz compress-zstd )" - -RESTRICT="binchecks strip test - unknown-license? ( bindist )" - -BDEPEND="initramfs? ( app-alternatives/cpio ) - compress-xz? ( app-arch/xz-utils ) - compress-zstd? ( app-arch/zstd )" - -#add anything else that collides to this -RDEPEND="!savedconfig? ( - redistributable? ( - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !sys-block/qla-fc-firmware - !sys-firmware/iwl1000-ucode - !sys-firmware/iwl6005-ucode - !sys-firmware/iwl6030-ucode - !sys-firmware/iwl3160-ucode - !sys-firmware/iwl7260-ucode - !sys-firmware/iwl3160-7260-bt-ucode - !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] - ) - )" - -QA_PREBUILT="*" - -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 - linux-info_pkg_setup - fi -} - -pkg_pretend() { - use initramfs && mount-boot_pkg_pretend -} - -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; 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 - WHENCE - README - ) - - # 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() { - ./copy-firmware.sh -v "${ED}/lib/firmware" || 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 - - if use savedconfig; then - if [[ -s "${S}/${PN}.conf" ]]; then - local 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?" - - einfo "Applying USE=savedconfig; Removing all files not listed in config ..." - find ! -type d -printf "%P\n" \ - | grep -Fvx -f "${files_to_keep}" \ - | xargs -d '\n' --no-run-if-empty rm -v - - if [[ ${PIPESTATUS[0]} -ne 0 ]]; then - die "Find failed to print installed files" - elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then - # grep returns exit status 1 if no lines were selected - # which is the case when we want to keep all files - die "Grep failed to select files to keep" - elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then - die "Failed to remove files not listed in config" - fi - fi - fi - - # 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 - - if use initramfs ; then - insinto /boot - doins "${S}"/amd-uc.img - fi -} - -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. - use initramfs && mount-boot_pkg_postinst -} - -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 -}