summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2024-01-14 14:48:32 +0000
committerJames Le Cuirot <chewi@gentoo.org>2024-01-14 14:56:54 +0000
commitbe8045ae1229b3713b3e5fac495e8ab10dbb46c8 (patch)
tree0c5b9f6aa73aa8ad3a10dce08a2eed8c781cd209
parentdev-embedded/rpi-eeprom: Switch from raspberrypi-userland to raspberrypi-utils (diff)
downloadgentoo-be8045ae1229b3713b3e5fac495e8ab10dbb46c8.tar.gz
gentoo-be8045ae1229b3713b3e5fac495e8ab10dbb46c8.tar.bz2
gentoo-be8045ae1229b3713b3e5fac495e8ab10dbb46c8.zip
dev-embedded/rpi-eeprom: Bump to 21.0_p1 with Pi 5 support
Thanks to Herbert Wantesh for the modifications. Closes: https://bugs.gentoo.org/916953 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
-rw-r--r--dev-embedded/rpi-eeprom/Manifest2
-rw-r--r--dev-embedded/rpi-eeprom/metadata.xml4
-rw-r--r--dev-embedded/rpi-eeprom/rpi-eeprom-21.0_p1.ebuild (renamed from dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1-r1.ebuild)21
3 files changed, 21 insertions, 6 deletions
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index 304f3a6739a8..f89d69a000ab 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -1,2 +1,4 @@
DIST rpi-eeprom_15.0-1.debian.tar.xz 10720 BLAKE2B c8915ebf859ebb1ea3a48af8077539a2513151f94b6965641970b717ad5a6693f4aa3867f241ce9cad5f47d371e7bfaaaa1e1fc34bad3e8059c7840bc5d567aa SHA512 92652b52eaf0d56c95ed23fcc5b4afe599e92d9331259d7450766cb53e06598bf3381a8716cf996c48fc2a20187523fc47e63aa365b2221c16284220042be3b8
DIST rpi-eeprom_15.0.orig.tar.gz 29800286 BLAKE2B ceda9bdc412a32443d0cb3fa444d1091f0f53215a5be6c546384a11f7fa28592d43bdf23f04a33925601b5e76e510b054b214d262904f03aafa2b959fcb5fc1e SHA512 eddea0c8057e13991e3a6493146c8785607162342321d48048ba5760ecc7f1c6687a03edffcd0be4a5549c333cdbb20e88d407c4212334e18178fb86cc6cd0a4
+DIST rpi-eeprom_21.0-1.debian.tar.xz 11876 BLAKE2B 5615237244e259a269f62951402ecf54bf947ff22efee157f664ddc49d4c053081544e05960dd934246fdccdf079d62d1932428718e8ad5ade09d0675af58ff5 SHA512 af347630ea8e3fffb5e86539067ca1005e71aea48b43e009bd6b50c602696e08e27ca931efbbc66f26c9bf30c98abd3853a221e067888597cad01078a1335b26
+DIST rpi-eeprom_21.0.orig.tar.gz 41026148 BLAKE2B 5398cf2087b0f5e0d3a2d9f113dbc788f82ff281b36ecbbd1689408db9368083ce77ff88e62a7eaa12dc524debe2f0724f6f00cc23bfb61160ae557bacfae57a SHA512 fc237efa8932a04e44bd47ad6837e5aed7547e3a9e0e03e196df801c83e95618290c04de7ee3458e6465bb273171084c664d6daaa49515e1dcbcd05cb3022f2d
diff --git a/dev-embedded/rpi-eeprom/metadata.xml b/dev-embedded/rpi-eeprom/metadata.xml
index fe9bc40f6b9f..074fc1d440e5 100644
--- a/dev-embedded/rpi-eeprom/metadata.xml
+++ b/dev-embedded/rpi-eeprom/metadata.xml
@@ -16,4 +16,8 @@
<upstream>
<remote-id type="github">raspberrypi/rpi-eeprom</remote-id>
</upstream>
+ <use>
+ <flag name="pi4">Install firmware files for the Raspberry Pi 4</flag>
+ <flag name="pi5">Install firmware files for the Raspberry Pi 5</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1-r1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-21.0_p1.ebuild
index 529d4fd60577..f6fc4077083e 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-15.0_p1-r1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-21.0_p1.ebuild
@@ -3,13 +3,13 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
inherit python-r1 systemd
MY_P="${PN}-$(ver_cut 1-2)"
MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
-DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
+DESCRIPTION="Updater for Raspberry Pi 4/5 bootloader and the VL805 USB controller"
HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
${MY_BASE_URL}.orig.tar.gz"
@@ -18,7 +18,11 @@ S="${WORKDIR}"
LICENSE="BSD rpi-eeprom"
SLOT="0"
KEYWORDS="~arm ~arm64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="pi4 pi5"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ^^ ( pi4 pi5 )
+"
BDEPEND="sys-apps/help2man"
DEPEND="${PYTHON_DEPS}"
@@ -37,6 +41,11 @@ src_prepare() {
"debian/rpi-eeprom.rpi-eeprom-update.service" || die "Failed sed on rpi-eeprom.rpi-eeprom-update.service"
}
+src_configure() {
+ use pi4 && export BROADCOM=2711
+ use pi5 && export BROADCOM=2712
+}
+
src_install() {
pushd "${MY_P}" 1>/dev/null || die "Cannot change into directory ${MY_P}"
@@ -46,12 +55,12 @@ src_install() {
dosbin rpi-eeprom-update rpi-eeprom-digest
keepdir /var/lib/raspberrypi/bootloader/backup
- for dir in critical stable beta; do
+ for dir in default latest critical stable beta; do
insinto /lib/firmware/raspberrypi/bootloader
- doins -r firmware/${dir}
+ doins -r firmware-$BROADCOM/${dir}
done
- dodoc firmware/release-notes.md
+ dodoc firmware-$BROADCOM/release-notes.md
help2man -N \
--version-string="${PV}" --help-option="-h" \