gentoo auto-resync : 24:10:2022 - 21:52:37

4 files changed, 81 insertions, 5 deletions

diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index d28cb4a18352..3f90010671e6 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -3,7 +3,9 @@ AUX raspberrypi-firmware-1.20201022-cmdline.txt 108 BLAKE2B b7830fdaf1ffb64cb07a
 AUX raspberrypi-firmware-1.20201022-config.txt 1784 BLAKE2B 7f37f02c486e6db2767b108e5926dc056f558ef32ae8ac3debea2fe7a210b159a2e4721846be8719520667c9bb86dc5d15c7c815f90dfe2686748f4d474fac61 SHA512 0909fae9bf731417f732486f7823f92a142824f5cab490b1736a16e7f569c9ecd805828c533c238dd3c5d75efcd2679e0d3697d988388000e1475a966fa66f12
 DIST raspberrypi-firmware-1.20211118.tar.gz 193544570 BLAKE2B db6c7c2e247f668b02210fb181305c3244f3d8a30f923656bf15cf418cb26822844df5b39af62b483e9e49405e13a60e57d6826aa0f3c3698920e8fc568656e2 SHA512 54881fc31ca0c9de8d8ca41ad6418e9d149975fbadbc0409f4136d4a31e70d743d55a16d4c0942305077d463c952edaa48be56d22d015983ab672dcaf5f134e2
 DIST raspberrypi-firmware-1.20220328.tar.gz 195699471 BLAKE2B e39ae746b46eb4f63aa2043df9fb60ce23b966d172e2c2c311942425e62896fb8ef171689c420bf2545065514a331e46c3bfb4d028eab8eea251357ee4c947f3 SHA512 b9e8676a94dce4621af25b8ba563a2dbd93f6fad61f5c5fb8b57b0ff5262151ff61598ce56a5f952f99f6e37f7c9ebf801a51849ee45ee328a168ca88e2522f3
+DIST raspberrypi-firmware-1.20220830.tar.gz 184738723 BLAKE2B 3675488a4ad9e3e8570eecfb56af2fd77d35dcc0da1cb14892a18e2b8471011411f0ec063c76fe51a72170df4d2f78acec11c0473272d6ba5248785c339fa3bd SHA512 9f5682254bf2596556b8759dd7b6ab1292ba6a28bf582f100682a1f14a03b43ac6ece654392e7a17f27db3940e8073b9e8645bd66aba8504a820fc29a3a1c500
 EBUILD raspberrypi-firmware-1.20211118.ebuild 1889 BLAKE2B c381485a3cf3bf5812190158c90726a82a9b35edee84358b7feed0c1255b0ab61088a4255c734ea7fa0d56f8e21a45f8e74a37398b52b6ea0c97b7987dad99e9 SHA512 63fefccade1dcb9a109953b33c65b45b70b8d76caa673f35049480c3cfa32590466e851ea1e5653b8574d45f4293eacb2b7baa2bfeb0b6e63e020e11503d4dbe
 EBUILD raspberrypi-firmware-1.20220328.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
-EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
-MISC metadata.xml 505 BLAKE2B 79f9a89cea4ce9658dfc203b6dbcd5251973f747c25996457a0556fed4d21c9482aef195759453ad1e7f5631308b5e2b089a55ff7cd617f168b604bf9c3620fe SHA512 9e2432add5a42ae97e2dc4e09a638786256ca76d22b93c2073c929a79ee216784b9ae284d268025883f00b6ddb1d682a9a1cd20bfe579feee7e8dface013eba4
+EBUILD raspberrypi-firmware-1.20220830.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
+EBUILD raspberrypi-firmware-9999.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
+MISC metadata.xml 682 BLAKE2B 27e6782667f13403b8f513d7f9c4532d6ba62a56d2132b9271c1ff10edda3063670e00c0e11bf504ef61d32c7cdfe0b45076dec30f59228eeb88ac80ff4ce597 SHA512 fa0a6cf32c873ab59e81517a1bc4bfa8333295a9ebe4f518150825006c12c22d4ba38dab093f1d075a1377f0c438a2a36b0c9dbb4296ead8413cbe8b946757cf
diff --git a/sys-boot/raspberrypi-firmware/metadata.xml b/sys-boot/raspberrypi-firmware/metadata.xml
index 8dc8059c3a3d..5a079f400051 100644
--- a/sys-boot/raspberrypi-firmware/metadata.xml
+++ b/sys-boot/raspberrypi-firmware/metadata.xml
@@ -12,5 +12,7 @@
 	<upstream>
 		<bugs-to>https://github.com/raspberrypi/firmware/issues</bugs-to>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
+		<remote-id type="cpe">cpe:/o:raspberrypi:raspberry_pi_4_model_b_firmware</remote-id>
+		<remote-id type="cpe">cpe:/o:raspberrypi:raspberry_pi_3_model_b%2b_firmware</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild
new file mode 100644
index 000000000000..595de0624e7e
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220830.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot readme.gentoo-r1
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm ~arm64"
+	S="${WORKDIR}/firmware-${PV}"
+fi
+
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		local msg=""
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+			msg+="/boot/config.txt "
+		fi
+
+		if [[ -n "${msg}" ]] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove (backup) your copies during install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index 7fe926ad7820..595de0624e7e 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit mount-boot readme.gentoo-r1
 
@@ -59,7 +59,7 @@ pkg_preinst() {
 
 		if [[ -n "${msg}" ]] ; then
 			msg="This package installs following files: ${msg}."
-			msg="${msg} Please remove (backup) your copies durning install"
+			msg="${msg} Please remove (backup) your copies during install"
 			msg="${msg} and merge settings afterwards."
 			msg="${msg} Further updates will be CONFIG_PROTECTed."
 			die "${msg}"