Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-firmware/raspberrypi-wifi-ucode/
Date: Sun, 20 Feb 2022 05:51:51
Message-Id: 1645336190.83391eab81544fe50edf51910ed51756d29d5c0c.sam@gentoo
1 commit: 83391eab81544fe50edf51910ed51756d29d5c0c
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 20 05:49:50 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 20 05:49:50 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83391eab
7
8 sys-firmware/raspberrypi-wifi-ucode: drop 20190114.1_p9, 20190114.1_p10
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-firmware/raspberrypi-wifi-ucode/Manifest | 2 -
13 .../raspberrypi-wifi-ucode-20190114.1_p10.ebuild | 66 ----------------------
14 .../raspberrypi-wifi-ucode-20190114.1_p9.ebuild | 66 ----------------------
15 3 files changed, 134 deletions(-)
16
17 diff --git a/sys-firmware/raspberrypi-wifi-ucode/Manifest b/sys-firmware/raspberrypi-wifi-ucode/Manifest
18 index 121dca28ca30..4922e67bcfdc 100644
19 --- a/sys-firmware/raspberrypi-wifi-ucode/Manifest
20 +++ b/sys-firmware/raspberrypi-wifi-ucode/Manifest
21 @@ -1,3 +1 @@
22 -DIST firmware-nonfree_20190114-1+rpt10.debian.tar.xz 2034132 BLAKE2B f6bdfbedc261acdcef976c02fb96f312a7c16c1c06c9419de73559c6ba59cf7d558b28c0dbf720bef3942a57c512fe8b5066bbb574b8286f9184ab029af9c20d SHA512 cf8eb4ad1947dc9f692fcf6540174a186bb054ea8cfdcd458c98452fa90125fc5079ac1cdfcf4171b6ee97023bc1d0a2a180d4b6ef6829c7c84a84922ee336f6
23 DIST firmware-nonfree_20190114-1+rpt11.debian.tar.xz 2038892 BLAKE2B a2d66e637cd26928c23855f5369c13b83e25b6b4353c82e9a62cb14b010a8c1fda566f6d200e0e7a706c7fb140238082238b7af80fe1f75fe3f07c815fc0eb6a SHA512 5ba6783dc3f3903f20321571a1fb2e11d7781de6d49689c68e6e1f194dad9cdddec90abc94a32a130323b2c8f9839af387c46aee895caf30ffb2f6dfe6d95b7d
24 -DIST firmware-nonfree_20190114-1+rpt9.debian.tar.xz 2040560 BLAKE2B 923adb08e4033f1f70c8e373464b5a4881f354fb218b163accb957b99ed1adf104f496b2156c772d881e7e01ed393d0f6c1563dbe797e1b1600a1f7f768292c4 SHA512 80df5df213105bfae231dbc81d17941258063971ea82e5d321b31d92a0be7101b9ecfe03aed02d9b7a0263d13bbcdcb862d4892a9e789da781af1430d81a821d
25
26 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
27 deleted file mode 100644
28 index ec573949e197..000000000000
29 --- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p10.ebuild
30 +++ /dev/null
31 @@ -1,66 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -DESCRIPTION="Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs"
38 -HOMEPAGE="https://github.com/RPi-Distro/firmware-nonfree
39 - https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree"
40 -MY_PN=firmware-nonfree
41 -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"
42 -S="${WORKDIR}"
43 -
44 -LICENSE="Broadcom"
45 -SLOT="0"
46 -KEYWORDS="arm arm64"
47 -
48 -RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
49 -
50 -pkg_pretend() {
51 - local -a BADFILES=()
52 - local txt file
53 - # /lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt
54 - # The above pattern works because the files we want to hit
55 - # have names of the form:
56 - # * /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt
57 - # * /lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
58 - # * /lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt
59 - # * /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
60 - # * /lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
61 - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
62 - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
63 - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
64 - # While the files installed by raspberrypi-wifi-ucode have names
65 - # of the form:
66 - # * /lib/firmware/brcm/brcmfmac43430-sdio.txt
67 - # * /lib/firmware/brcm/brcmfmac43436-sdio.txt
68 - # * /lib/firmware/brcm/brcmfmac43455-sdio.txt
69 - # * /lib/firmware/brcm/brcmfmac43456-sdio.txt
70 - # So no overlap is assured.
71 - for txt in "${EPREFIX}"/lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt; do
72 - [[ -e "${txt}" ]] && BADFILES+=( "${txt}" )
73 - done
74 -
75 - if [[ "${#BADFILES[@]}" -gt 1 ]]; then
76 - eerror "The following files should be excluded from the savedconfig of"
77 - eerror "linux-firmware and linux-firmware should be re-emerged. Even"
78 - eerror "though they do not collide with files from ${PN},"
79 - eerror "they may be loaded preferentially to the files included in"
80 - eerror "${PN}, leading to undefined behaviour."
81 - eerror "List of files:"
82 - for file in "${BADFILES[@]}"; do
83 - eerror "${file}"
84 - done
85 - fi
86 -}
87 -
88 -src_prepare() {
89 - default
90 - eapply -p1 debian/patches/sdio-txt-files.patch
91 -}
92 -
93 -src_install() {
94 - insinto /lib/firmware/brcm
95 - doins brcm/*
96 - dodoc debian/changelog
97 -}
98
99 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
100 deleted file mode 100644
101 index 5475720b31f7..000000000000
102 --- a/sys-firmware/raspberrypi-wifi-ucode/raspberrypi-wifi-ucode-20190114.1_p9.ebuild
103 +++ /dev/null
104 @@ -1,66 +0,0 @@
105 -# Copyright 1999-2020 Gentoo Authors
106 -# Distributed under the terms of the GNU General Public License v2
107 -
108 -EAPI=7
109 -
110 -DESCRIPTION="Most up-to-date uCode for the Broadcom wifi chips on Raspberry Pi SBCs"
111 -HOMEPAGE="https://github.com/RPi-Distro/firmware-nonfree
112 - https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree"
113 -MY_PN=firmware-nonfree
114 -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"
115 -S="${WORKDIR}"
116 -
117 -LICENSE="Broadcom"
118 -SLOT="0"
119 -KEYWORDS="arm arm64"
120 -
121 -RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
122 -
123 -pkg_pretend() {
124 - local -a BADFILES=()
125 - local txt file
126 - # /lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt
127 - # The above pattern works because the files we want to hit
128 - # have names of the form:
129 - # * /lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt
130 - # * /lib/firmware/brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
131 - # * /lib/firmware/brcm/brcmfmac43430-sdio.MUR1DX.txt
132 - # * /lib/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
133 - # * /lib/firmware/brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
134 - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
135 - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
136 - # * /lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
137 - # While the files installed by raspberrypi-wifi-ucode have names
138 - # of the form:
139 - # * /lib/firmware/brcm/brcmfmac43430-sdio.txt
140 - # * /lib/firmware/brcm/brcmfmac43436-sdio.txt
141 - # * /lib/firmware/brcm/brcmfmac43455-sdio.txt
142 - # * /lib/firmware/brcm/brcmfmac43456-sdio.txt
143 - # So no overlap is assured.
144 - for txt in "${EPREFIX}"/lib/firmware/brcm/brcmfmac434{30,36,55,56}-sdio.*.txt; do
145 - [[ -e "${txt}" ]] && BADFILES+=( "${txt}" )
146 - done
147 -
148 - if [[ "${#BADFILES[@]}" -gt 1 ]]; then
149 - eerror "The following files should be excluded from the savedconfig of"
150 - eerror "linux-firmware and linux-firmware should be re-emerged. Even"
151 - eerror "though they do not collide with files from ${PN},"
152 - eerror "they may be loaded preferentially to the files included in"
153 - eerror "${PN}, leading to undefined behaviour."
154 - eerror "List of files:"
155 - for file in "${BADFILES[@]}"; do
156 - eerror "${file}"
157 - done
158 - fi
159 -}
160 -
161 -src_prepare() {
162 - default
163 - eapply -p1 debian/patches/sdio-txt-files.patch
164 -}
165 -
166 -src_install() {
167 - insinto /lib/firmware/brcm
168 - doins brcm/*
169 - dodoc debian/changelog
170 -}