gentoo auto-resync : 13:07:2024 - 12:26:41

2 files changed, 68 insertions, 0 deletions

diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 878bccdddc60..08637a6a52fa 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -6,6 +6,7 @@ DIST raspberrypi-firmware-1.20211029.tar.gz 193543221 BLAKE2B 308206d6bdfbe15bfe
 DIST raspberrypi-firmware-1.20220331.tar.gz 195722349 BLAKE2B 7f2748bba0cd255921cc7cd1117bd8a16611a835ab7bcb62525675f6b0d627ea8ad40b39aa83e00f7e73428e2af912906e53c3e3214b5cb079a2baeae985f2a2 SHA512 c510ddb5eb1c6ea1aa69f0063551445dd21092f68e19b64b885558d2c47735d4e9f781ef9674fbe3a9894d66eb07ccbb004541c9a85005318911fabda899c2cc
 DIST raspberrypi-firmware-1.20230405.tar.gz 187674867 BLAKE2B 8f35b2dd906cd2459c83c3cec2ba10e8388afa35213f80bd3fd7a5ba7061c7ad0f9db5a5c39ab476f8a2b4754cf80665c2dff54f7ae61edf3c85d91ae37f9f9f SHA512 ddc9baeba4e2e442bfe41e427c7ecdd38ee6d44ac4e7c297ae7d5a6c64b0aa1a81206929baeb9aceb74de6f96707b30040e82450ef4f01a78b958299c72e3857
 DIST raspberrypi-firmware-1.20240424.tar.gz 153632287 BLAKE2B 7718d26ee66751484edd359412bc186d7ef5e68af97abe814b340b4c21fb4d6f7abc2caa8c7d0ec62ac742a9c932a08b4393d32d4ba79480c9648d742bead0b8 SHA512 90ad6872886f3efb004b57e258ba8ec0ef0bf619e251e2f0d259c22ef9cb816f6b0f2d5fb1f3a0ece13bf69fecfe8fe70793b90ea243163b5a585930e554e3d5
+DIST raspberrypi-firmware-1.20240529.tar.gz 153776579 BLAKE2B 8348429940056600e9c1a3f63d2575fc285ef379ad1663460620d1b9fb65ef1b32d789a0b525903de90e5ec9886b173c7e3692a87c4ee3c9904c88c1bf85b071 SHA512 1b127924960efe8430250fae7a496805e4285d1b72b180a829be6d5eee6be2ecf325bdf9c81f9806ef9aae0adeb5e8832197e79c281754b87028fcdfe1b0961b
 DIST raspberrypi-image-4.14.98_p20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
 EBUILD raspberrypi-image-4.14.98_p20190215.ebuild 850 BLAKE2B dae8b4af65b42cedec26326ead4b2e9afaed44affe568cc4bf04a09eaebd6bbd10f93f456327eb9f30b6493670e586cb2e09fe7c5306b883a6d8704c5f10d1c5 SHA512 8833a26f7b6521754ac02ef6024140ee9dc3d1dbe836b9accec13bd844a0a7a087730b9794031bc66cc7bd5ca5ef4ec4f1614c6ff6a609ebd4daa511eb636903
 EBUILD raspberrypi-image-4.19.75_p20190925.ebuild 1216 BLAKE2B cd69ba78849fe10a42928f4a4bd5857c43ef3f79972a423c8b1d92d3ab1a1aa39c5ac42a00582e22c7c447961ff897d303e14f011bbcc82d886b768a640cc02c SHA512 d9d5032f4fb1518dda3d4d230ccb94df327147f3168992e36dbebe522e09c3033c063287ed5844b09d7129700f61942c196361f32a0700599ab8f5a8f97de904
@@ -16,5 +17,6 @@ EBUILD raspberrypi-image-5.15.32_p20220331.ebuild 2048 BLAKE2B 3695b04263cb921f2
 EBUILD raspberrypi-image-5.4.79_p20201201.ebuild 1223 BLAKE2B 7b446c890c1a0549a43b95a17cd3d20637e58e824b0ac715c90df1f6381479a3a87134acf829093a4742959b27a3d8f1383cd5e8cf0a793aea93860f036d7245 SHA512 6d3630742a016e99c1f0d787cf10b6ca7e62ee93e2cbea0894dbb084d2c66c7f5765032f8668909033df7f0a121b9cb522596a00071c434ba133a6e851c1bf83
 EBUILD raspberrypi-image-6.1.21_p20230405.ebuild 2046 BLAKE2B 23c3e3844794cfd8a044c42d28932c065b4c75a05ab1a18b96af68dc2f176e2bd3c99ca02f2a70eb7ce9f5dfe4963b47b349e7c32e099c7d0087907f6dbf4b23 SHA512 c49dc3ca11609fb2d0d71e1abdd67ecdfd263bcf970eeea9aed51b1b63e871bf93aeffbcfd905b89489f421e4414e42240dee668ca99b58c8ff9d84870279bd4
 EBUILD raspberrypi-image-6.6.28_p20240424.ebuild 2046 BLAKE2B 83d94c2c6ec7f885a38de87d9576bb2614d3f2c1f5519cc5ba2e7689b8d3a473a3ff1a847d170a9491166f2a8b864270463f70034190e0f4e41ed621e5520e94 SHA512 55a41c06eeb42c9e0218124d812e3700eb3063e1c361367c0e7dd7c090cb4ab4c47d722fee7e106bf1e7ad732f2f263a0c83be3a72e55d9e79a041a94bf7b663
+EBUILD raspberrypi-image-6.6.31_p20240529.ebuild 2048 BLAKE2B 3085511c58ad04db75288b2b299213fea77a0c51ae0c3a6ae219f9685b632411244810c6be6f2523f6365eb9ccd28f6cf88f21de2cfba22d8c8a66de351b23be SHA512 1f3715fdc285deed7a7c77089b8a3fa222af1e7513cdb894c598ab2ceebd031bba7475cbc7bd0c47c9c75acbdddadc84c64df22b48e459474d006a8544d99cbd
 EBUILD raspberrypi-image-9999.ebuild 2048 BLAKE2B 3695b04263cb921f260e6b2da523ac02d929d56cb1c47e167e766c7759986a55ce84e70bfc3705f72e07b9a966319fec678669db22e4f6e6e6d2e5106cc4169b SHA512 88009c090231ed211ae8f95065d61350c4bb8643d866747ed9a2ad7f1731d418fb61fe91625e58a06432ae8fc6be072b832c5533b3ace574c78fdda6b983d3f7
 MISC metadata.xml 334 BLAKE2B 9f620aee0baac33bf45c83d0422b42441cca1d3b8b60e268d62b4ea135976698bbb88725974c0e37f7a3897fa6aada1e89a7033c69ddf8b2c3018da021ca33b5 SHA512 d345c5c627f80ae67a096981fe3d619d5dca5c2a42d5d45d44d660faeb6f638cd62f6b94666132b1effd9d87182ee99066616169c3d22cc99c0e08fe8340fdc5
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-6.6.31_p20240529.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-6.6.31_p20240529.ebuild
new file mode 100644
index 000000000000..8a8a4752bce4
--- /dev/null
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-6.6.31_p20240529.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot
+
+# Go to e.g. https://github.com/raspberrypi/firmware/tree/1.20211029/modules
+# for the latest tag to see which kernel version it corresponds to.
+
+DESCRIPTION="Raspberry Pi (all versions) kernel and modules"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+	inherit git-r3
+else
+	[[ $(ver_cut 4) == p ]] || die "Unsupported version format, tweak the ebuild."
+	MY_PV="1.$(ver_cut 5)"
+
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
+	S="${WORKDIR}/firmware-${MY_PV}"
+	KEYWORDS="-* ~arm ~arm64"
+fi
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+# Temporary safety measure to prevent ending up with a pair of
+# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
+# both of which installed device tree files.
+# Restore to simply "sys-boot/raspberrypi-firmware" when the mentioned version
+# and all older ones are deleted.
+RDEPEND=">sys-boot/raspberrypi-firmware-1.20190709"
+
+src_prepare() {
+	default
+
+	local expected_kernel_version="$(ver_cut 1-3)+"
+	local found_kernel_version=( "${S}"/modules/$(ver_cut 1).*.*+ )
+
+	found_kernel_version=${found_kernel_version[0]}
+	found_kernel_version=${found_kernel_version##*/}
+
+	if [[ ${expected_kernel_version} != ${found_kernel_version} ]] ; then
+		eerror "Expected kernel version: ${expected_kernel_version}"
+		eerror "Found kernel version: ${found_kernel_version}"
+		die "Please fix ebuild version to contain ${found_kernel_version}!"
+	fi
+
+	if [[ ! -d "${S}"/modules/${expected_kernel_version} ]] ; then
+		eerror "Kernel module directory is missing!"
+		die "${S}/modules/${expected_kernel_version} not found!"
+	fi
+}
+
+src_install() {
+	insinto /lib/modules
+	doins -r modules/*
+	insinto /boot
+	doins boot/*.img
+
+	doins boot/*.dtb
+	doins -r boot/overlays
+}