commit: 83391eab81544fe50edf51910ed51756d29d5c0c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Feb 20 05:49:50 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 20 05:49:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83391eab
sys-firmware/raspberrypi-wifi-ucode: drop 20190114.1_p9, 20190114.1_p10 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-firmware/raspberrypi-wifi-ucode/Manifest | 2 - .../raspberrypi-wifi-ucode-20190114.1_p10.ebuild | 66 ---------------------- .../raspberrypi-wifi-ucode-20190114.1_p9.ebuild | 66 ---------------------- 3 files changed, 134 deletions(-) diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest index 121dca28ca30..4922e67bcfdc 100644 --- a/sys-firmware/raspberrypi-wifi-ucode/Manifest +++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest @@ -1,3 +1 @@ -DIST firmware-nonfree_20190114-1+rpt10.debian.tar.xz 2034132 BLAKE2B f6bdfbedc261acdcef976c02fb96f312a7c16c1c06c9419de73559c6ba59cf7d558b28c0dbf720bef3942a57c512fe8b5066bbb574b8286f9184ab029af9c20d SHA512 cf8eb4ad1947dc9f692fcf6540174a186bb054ea8cfdcd458c98452fa90125fc5079ac1cdfcf4171b6ee97023bc1d0a2a180d4b6ef6829c7c84a84922ee336f6 DIST firmware-nonfree_20190114-1+rpt11.debian.tar.xz 2038892 BLAKE2B a2d66e637cd26928c23855f5369c13b83e25b6b4353c82e9a62cb14b010a8c1fda566f6d200e0e7a706c7fb140238082238b7af80fe1f75fe3f07c815fc0eb6a SHA512 5ba6783dc3f3903f20321571a1fb2e11d7781de6d49689c68e6e1f194dad9cdddec90abc94a32a130323b2c8f9839af387c46aee895caf30ffb2f6dfe6d95b7d -DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild deleted file mode 100644 index ec573949e197..000000000000 --- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs" -HOMEPAGE="https://github.com/RPi-Distro/firmware-nonfree - https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree"; -MY_PN=firmware-nonfree -SRC_URI="https://archive.raspberrypi.org/debian/pool/main/f/${MY_PN}/${MY_PN}_$(ver_cut 1)-$(ver_cut 2)+rpt$(ver_cut 4).debian.tar.xz" -S="${WORKDIR}" - -LICENSE="Broadcom" -SLOT="0" -KEYWORDS="arm arm64" - -RDEPEND="!sys-kernel/linux-firmware[-savedconfig]" - -pkg_pretend() { - local -a BADFILES=() - local txt file - # /lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt - # The above pattern works because the files we want to hit - # have names of the form: - # * /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt - # * /lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt - # * /lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt - # * /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - # While the files installed by raspberrypi-wifi-ucode have names - # of the form: - # * /lib/firmware/brcm/brcmfmac43430-sdio.txt - # * /lib/firmware/brcm/brcmfmac43436-sdio.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.txt - # * /lib/firmware/brcm/brcmfmac43456-sdio.txt - # So no overlap is assured. - for txt in "${EPREFIX}"/lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt; do - [[ -e "${txt}" ]] && BADFILES+=( "${txt}" ) - done - - if [[ "${#BADFILES[@]}" -gt 1 ]]; then - eerror "The following files should be excluded from the savedconfig of" - eerror "linux-firmware and linux-firmware should be re-emerged. Even" - eerror "though they do not collide with files from ${PN}," - eerror "they may be loaded preferentially to the files included in" - eerror "${PN}, leading to undefined behaviour." - eerror "List of files:" - for file in "${BADFILES[@]}"; do - eerror "${file}" - done - fi -} - -src_prepare() { - default - eapply -p1 debian/patches/sdio-txt-files.patch -} - -src_install() { - insinto /lib/firmware/brcm - doins brcm/* - dodoc debian/changelog -} diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild deleted file mode 100644 index 5475720b31f7..000000000000 --- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs" -HOMEPAGE="https://github.com/RPi-Distro/firmware-nonfree - https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree"; -MY_PN=firmware-nonfree -SRC_URI="https://archive.raspberrypi.org/debian/pool/main/f/${MY_PN}/${MY_PN}_$(ver_cut 1)-$(ver_cut 2)+rpt$(ver_cut 4).debian.tar.xz" -S="${WORKDIR}" - -LICENSE="Broadcom" -SLOT="0" -KEYWORDS="arm arm64" - -RDEPEND="!sys-kernel/linux-firmware[-savedconfig]" - -pkg_pretend() { - local -a BADFILES=() - local txt file - # /lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt - # The above pattern works because the files we want to hit - # have names of the form: - # * /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt - # * /lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt - # * /lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt - # * /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - # While the files installed by raspberrypi-wifi-ucode have names - # of the form: - # * /lib/firmware/brcm/brcmfmac43430-sdio.txt - # * /lib/firmware/brcm/brcmfmac43436-sdio.txt - # * /lib/firmware/brcm/brcmfmac43455-sdio.txt - # * /lib/firmware/brcm/brcmfmac43456-sdio.txt - # So no overlap is assured. - for txt in "${EPREFIX}"/lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt; do - [[ -e "${txt}" ]] && BADFILES+=( "${txt}" ) - done - - if [[ "${#BADFILES[@]}" -gt 1 ]]; then - eerror "The following files should be excluded from the savedconfig of" - eerror "linux-firmware and linux-firmware should be re-emerged. Even" - eerror "though they do not collide with files from ${PN}," - eerror "they may be loaded preferentially to the files included in" - eerror "${PN}, leading to undefined behaviour." - eerror "List of files:" - for file in "${BADFILES[@]}"; do - eerror "${file}" - done - fi -} - -src_prepare() { - default - eapply -p1 debian/patches/sdio-txt-files.patch -} - -src_install() { - insinto /lib/firmware/brcm - doins brcm/* - dodoc debian/changelog -}
