From d05150f06fa67b115a83f822b1e285dca011e1b7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Nov 2022 21:10:25 +0000 Subject: gentoo auto-resync : 02:11:2022 - 21:10:25 --- sys-firmware/raspberrypi-wifi-ucode/Manifest | 2 +- .../raspberrypi-wifi-ucode-20210315.3_p7-r1.ebuild | 69 -------------------- .../raspberrypi-wifi-ucode-20210315.3_p7-r2.ebuild | 76 ++++++++++++++++++++++ 3 files changed, 77 insertions(+), 70 deletions(-) delete mode 100644 sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r1.ebuild create mode 100644 sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r2.ebuild (limited to 'sys-firmware/raspberrypi-wifi-ucode') diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest index 50fad404f73e..7c08a6fa8133 100644 --- a/sys-firmware/raspberrypi-wifi-ucode/Manifest +++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest @@ -3,5 +3,5 @@ DIST firmware-nonfree_20210315-3+rpt5.debian.tar.xz 1743300 BLAKE2B 5de090eefc68 DIST firmware-nonfree_20210315-3+rpt7.debian.tar.xz 1755320 BLAKE2B d7d5a3a2a1f7fbf6f18c751a92012bb7018aab403091288c291d64dbc7c46b26053f3d8693253625d7603a3df9ef9ec8e5f27c365dd0e0904725f351c54931a7 SHA512 e0ae23a0306d941d0633be19e964dbaf657fe64d97bf767691558e8565814f71dbd4f45dad8219ccc8a8953bc8088f8a98e65a11d389e0d0868bf20349060ded EBUILD raspberrypi-wifi-ucode-20190114.1_p11.ebuild 2379 BLAKE2B 6f3569abe1d0c0071bcd03e7cbed2b45ce7eafdb59a20b793e6a6cb77e70c49c3acb432f2db4727acba3d8b0a2f00a62d7c80a9fc1d83f96940a153d8e8e7979 SHA512 63e2b279a8ca863d7837e6f2d864f4ad3ebb1a1bdb3555415415fb7b92e7739f8623322a41e479a442512df4d967a4ae9b8c04ead4ab1502d72b97873228b7c0 EBUILD raspberrypi-wifi-ucode-20210315.3_p5-r1.ebuild 2469 BLAKE2B e53483e6971e8a1a71ab50de3011eee09b5df84ed7526617fb7206504b5161860c470db9be1b07c7ccf521c3859cfb12e005443d99b853c0e80f3dc1da4305cd SHA512 8da229dcd2ba62f120abebb9273dcea1d962209082e0fc72d23dc6170d412f42f1f0a8855c69bf961170f6c83669f7ec58cd6ff7a886747da35e1d26cf1e06e1 -EBUILD raspberrypi-wifi-ucode-20210315.3_p7-r1.ebuild 2437 BLAKE2B b8ed0f09e46fa6c587770133d0a5fc3e60410604cf6ba73053bb4c78a9324d02b4348b8748030b262c53aa5288f8e66239f08f4cc60bf643dffd8df7fbe04975 SHA512 b9dd9921c0ba8ef5c09855680128d90a6863d1cab789ba15f5a980247c061b07ffaab64ac23e11b796ef9318740d851e44cdbe5f508facc15533b2009d0c09b0 +EBUILD raspberrypi-wifi-ucode-20210315.3_p7-r2.ebuild 2683 BLAKE2B 62f1479512f5353dd15ace992dcaa17b61393603613307d161e5205c7ff4553bb43b2a880c4578bdba04ad34a4e07396f748fd192caa9ffd8a264be31812c3b2 SHA512 f66ca5ed5eda14fb9d536e6af3ca8936cd3139b39ace2c5586858d9f82dd08f03a33046bec31ec73bc4531187c5d058256378bdf632f0f17676573c90f69b031 MISC metadata.xml 713 BLAKE2B 0440fb00ea20009509c7d0aeb24bb26aa0e982e69457fd7f325aef56f810c448b5776fee4ec4aec58c40e4b895a724e7d0cec605037dea44f19cc487a9b423c3 SHA512 6fbe06d1c2c3913d2d4c40b575b9b0178110184e89be41302a176b15beafa81c7dbc4f755d92fa045210869902b2a37fe5f42bbaae69760c860a63a42d1ab04e 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 deleted file mode 100644 index d6723724a318..000000000000 --- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r1.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/changelog -} diff --git a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r2.ebuild b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r2.ebuild new file mode 100644 index 000000000000..8d5ab7aa1fc3 --- /dev/null +++ b/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20210315.3_p7-r2.ebuild @@ -0,0 +1,76 @@ +# 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_configure() { + unlink "${S}"/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin || die + ln -rs \ + "${S}"/debian/config/brcm80211/cypress/cyfmac43455-sdio-standard.bin \ + "${S}"/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin || die +} + +src_install() { + insinto /lib/firmware/brcm + doins debian/config/brcm80211/brcm/* + + insinto /lib/firmware/cypress + doins debian/config/brcm80211/cypress/* + + dodoc debian/changelog +} -- cgit v1.2.3