From 7406336f72ac5d1d1ef46b9e2601e54350be30ed Mon Sep 17 00:00:00 2001 From: Dennis Lamm Date: Wed, 26 Oct 2022 08:58:12 +0200 Subject: sys-firmware/raspberrypi-wifi-ucode: fixed dodoc removed installation of no longer provided LICENSE file Signed-off-by: Dennis Lamm Closes: https://github.com/gentoo/gentoo/pull/27955 Signed-off-by: Dennis Lamm --- .../raspberrypi-wifi-ucode-20210315.3_p7-r1.ebuild | 69 ++++++++++++++++++++++ .../raspberrypi-wifi-ucode-20210315.3_p7.ebuild | 69 ---------------------- 2 files changed, 69 insertions(+), 69 deletions(-) create mode 100644 sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r1.ebuild delete mode 100644 sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild (limited to 'sys-firmware') diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r1.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r1.ebuild new file mode 100644 index 000000000000..d6723724a318 --- /dev/null +++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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=" + net-wireless/wireless-regdb + !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_install() { + insinto /lib/firmware/brcm + doins debian/config/brcm80211/brcm/* + + insinto /lib/firmware/cypress + doins debian/config/brcm80211/cypress/* + + dodoc debian/changelog +} diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild deleted file mode 100644 index ce8516611329..000000000000 --- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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=" - net-wireless/wireless-regdb - !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_install() { - insinto /lib/firmware/brcm - doins debian/config/brcm80211/brcm/* - - insinto /lib/firmware/cypress - doins debian/config/brcm80211/cypress/* - - dodoc debian/config/brcm80211/LICENSE debian/changelog -} -- cgit v1.2.3-65-gdbad