gentoo auto-resync : 07:06:2023 - 21:43:38

5 files changed, 147 insertions, 0 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 6cb06770003c..578d172ef888 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 4fbc42799f2c..390078dd5324 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -4,6 +4,7 @@ DIST raspberrypi-firmware-1.20210201.tar.gz 191785657 BLAKE2B 7ef315411e3bc57251
 DIST raspberrypi-firmware-1.20210527.tar.gz 192247084 BLAKE2B 329707dfb2905b36926a3f0ecf1a8e3bc2b52e1a376f98ca7cfe9ec7b69d0fb370d8e23907f5bbd9ea75cf7fed5babd6fe54934919995dec6914e888d95e5fbe SHA512 5a48d1fae768c30528359a14371f59564447d2fb8a145cafa89d7d29352095c5b7ac33bfcbc8da494284c9d41e7dbafe4e863e8efd963a17ea6b6b9699b814a7
 DIST raspberrypi-firmware-1.20211029.tar.gz 193543221 BLAKE2B 308206d6bdfbe15bfe5f39cd230e6d4857f460744aafcbcc9eee6a74f05a3a9dc861e7c3e36baea46fdb1d1d1dc28b5edebf70bce3a3c085228b2ea321ef7a85 SHA512 7a1fe3b1645006c35fa49e842b9ece53b386ece42b8db99649de8d4bc0c19e34b0807767290e26422528606c5847843533aaa0edd0716e9f9f9dcae340a4dce0
 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-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
@@ -12,5 +13,6 @@ EBUILD raspberrypi-image-5.10.17_p20210527.ebuild 1223 BLAKE2B 21dce369d11d1c2a2
 EBUILD raspberrypi-image-5.10.63_p20211029.ebuild 1367 BLAKE2B 96dd7bb09eb356d4c6e1af2192bc00ff2a135236a166366f4fd2abb9e1d080bf18cb07c7a30853f636ca614d23b0eca1992100fb3178b8866858bcbc9b2e3afb SHA512 401b0d34f9a9a0c474d04e19e7e09b9fbe13737926b01f4596af01b1587d353a4508b180be0c251ff0bdff22527bc8a8ad19d73947482de866e765930220de90
 EBUILD raspberrypi-image-5.15.32_p20220331.ebuild 2048 BLAKE2B 3695b04263cb921f260e6b2da523ac02d929d56cb1c47e167e766c7759986a55ce84e70bfc3705f72e07b9a966319fec678669db22e4f6e6e6d2e5106cc4169b SHA512 88009c090231ed211ae8f95065d61350c4bb8643d866747ed9a2ad7f1731d418fb61fe91625e58a06432ae8fc6be072b832c5533b3ace574c78fdda6b983d3f7
 EBUILD raspberrypi-image-5.4.79_p20201201.ebuild 1223 BLAKE2B 7b446c890c1a0549a43b95a17cd3d20637e58e824b0ac715c90df1f6381479a3a87134acf829093a4742959b27a3d8f1383cd5e8cf0a793aea93860f036d7245 SHA512 6d3630742a016e99c1f0d787cf10b6ca7e62ee93e2cbea0894dbb084d2c66c7f5765032f8668909033df7f0a121b9cb522596a00071c434ba133a6e851c1bf83
+EBUILD raspberrypi-image-6.1.21_p20230405.ebuild 2048 BLAKE2B 9956fb3d9179bbba7bec5a0f0d3eb2af4cd07f02a430d3c8bc3a304a40fc63c5ffcec31ccc2899d3dd1644f67a0af6daccc64fd8e14a7ebb5e10f481f734b487 SHA512 11e2e15da8c7b28bd0fd546e7d93e5cf0fba7e7299b8042539925966142433dd7a8dcd742207369e48b6ef7dd000f54b273233c32076fd8b25a0b616665694c0
 EBUILD raspberrypi-image-9999.ebuild 2048 BLAKE2B 3695b04263cb921f260e6b2da523ac02d929d56cb1c47e167e766c7759986a55ce84e70bfc3705f72e07b9a966319fec678669db22e4f6e6e6d2e5106cc4169b SHA512 88009c090231ed211ae8f95065d61350c4bb8643d866747ed9a2ad7f1731d418fb61fe91625e58a06432ae8fc6be072b832c5533b3ace574c78fdda6b983d3f7
 MISC metadata.xml 325 BLAKE2B 4f9cf3610ce1a44da9fc78b78b9df541c76d2b76da0e040f666579bce00f5ab5cf8aec4ee4921b50d5a3cd249ee857faa39d9f780e8fd42a57506c5f6dde3dbe SHA512 529fe413c16257c123c53c2e09cdc457b9481acc1b85cb76458a6b34fa1424cfa76807d72a298beba20d99349c1a9e224bd8f29af96ec9d14cabe6029dc82c44
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-6.1.21_p20230405.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-6.1.21_p20230405.ebuild
new file mode 100644
index 000000000000..079915b5cb66
--- /dev/null
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-6.1.21_p20230405.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 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
+}
diff --git a/sys-kernel/raspberrypi-sources/Manifest b/sys-kernel/raspberrypi-sources/Manifest
index 570ced9bd41b..29f468d8fe0d 100644
--- a/sys-kernel/raspberrypi-sources/Manifest
+++ b/sys-kernel/raspberrypi-sources/Manifest
@@ -1,8 +1,12 @@
 AUX raspberrypi-sources-5.15.32-gentoo-kconfig.patch 14618 BLAKE2B d2b6bb66b8ddf7b17fff2b7e6d55cdd8360d6d4f0f033e513e34f5474c0078f21bd49ba6e8d28794ba1468e50f0e463fd79d64aa64f5d50025097e4fe733a2ac SHA512 6cd674d3dce0cd0565f28f903ff7d1b0beb492c4fa5c8f8c52c9b99c5da6f7d15e77e42d78b8671a73451033602815b3b858d59638c22a3c7c69d0e43d6ff4e1
 DIST genpatches-5.15-22.base.tar.xz 986832 BLAKE2B 48fcd267e6e28850d226693b902fd66696024e75db6a75bb78ec79c7ac8afdac62643c4113ff205c301024d245f075716e0bf8083f97917dcfc8b1fcd71b674e SHA512 e8c64bd91caedc3dcd98301dbcbd2003b4aceb5a9713bd908a69448eaa2aea945fa8162e57442862b03daa0e1a4e7642e4504701b1f34a6edb127692e582e0e0
 DIST genpatches-5.15-22.extras.tar.xz 3876 BLAKE2B 95daac6c95b82d628c0551b4e18e7c3ad9a5722b5ab8f087889b15bdeea8c6f5e232ee8b365bfb4a7c6730207d4735a0fb648b389626f35cda2593caa83ff3e2 SHA512 0616c4a976d22a5491039a6bc3babdd7e9095a2c53e2a1530d1ecfcf50a2dbfca637c1b6771078efc92e3371ac15f332f85f653d267ea8e6262ffd305be2723a
+DIST genpatches-6.1-25.base.tar.xz 1200876 BLAKE2B 7050f6e95a28f5886cce9b53823f6219a22a5b23cad5471bfa9e83eca208b8369395075e9aabdbe4d33b53b8c01aff3d3d0886115850e327baf12a946b851e1d SHA512 ea30e0d44ab64a2aa36ad7a83cf2df7924ba5e699c92268bc5f3d54acadefc9c836a00e7e27cc02400a6751ffe1c3cd45e6b9891a3fc0aa8d23ad8e535f18e4c
+DIST genpatches-6.1-25.extras.tar.xz 3812 BLAKE2B f73698c57031c9d7f5edd9ba2b865e32064c38b528649a8144f856bacf35ae3570d1fc936ee25a88bd52fd0765fff05bec42686b8b3fc5566df187bd57d59be5 SHA512 ac2bdccbc6bd1de82cbdfe4edac978e068445b8e064bcc6a833b04f15b86592304c19651884dc0769719ade1b220c8c0f704beca240ce24ab370621ad6849aee
 DIST linux-5.15.76_p20221104-raspberrypi.tar.gz 199660690 BLAKE2B 899714102e52904b7a37d155e42e94ed4b0e6c6600ac40fbd3cf66d15f84bb6d06afa7acf5c9624f44e9888d03d101823b419547d7ad8e566b4e55aaa077f11b SHA512 648262937e0afdb331678e0b2f913ad22788f1373f9ecd0d495e748a78399d6a69e93024268e1c0567acb4b1c9242b3ca6bd060e73b91a77529a93e4e29181c6
 DIST linux-5.15.84_p20230106-raspberrypi.tar.gz 199714807 BLAKE2B f3579d4b16921141055c0a62787084d2fb7db057bf9205c45e4a6515969bd3136a0dfe08c26848e691a5ea74d1f23533e4352c8fe70edf4b7000785958caf6ea SHA512 97ed02f35b42f144db72f802339f4952148596e3e5a0725fedd7a57618c1695cb802d58f6183e257ebfd242d35bf69f1eefea78ab9df109f6158af713d7d5f30
+DIST linux-6.1.21_p20230405-raspberrypi.tar.gz 221783059 BLAKE2B 5e9e13b6410df1b9e4bcdef85a6b33de83621a74d89bb6760dcff86cd736262513f613e9279a8dccf5ca306a807c16652084a3e6b4cb34c3658a8e9e3196c5d1 SHA512 0c8252833bb737977c0981ed48764ff9742de7cb494fefec532c90312e0d8e0e48a230dd14a0d6f99b54b015e6c91e647b579f2ef7408b80e349a547767d9925
 EBUILD raspberrypi-sources-5.15.76_p20221104.ebuild 1493 BLAKE2B ca51566dd0486e60d85ee05534a4227d6c15dd6bd338133f735c6543f28190859adc4b165eb94e82c8942e7bb951de590eba3e966bd351010537ff0f2d0c3072 SHA512 8c140b0af450b03930bdd97a6bf6978cd1bdbeb579a50e1066933972b563c15ab62185a4ed8733aa2673f6b86c0877e3b9ce38d3ac5b3327876bf55bd9dd1734
 EBUILD raspberrypi-sources-5.15.84_p20230106.ebuild 1493 BLAKE2B ca51566dd0486e60d85ee05534a4227d6c15dd6bd338133f735c6543f28190859adc4b165eb94e82c8942e7bb951de590eba3e966bd351010537ff0f2d0c3072 SHA512 8c140b0af450b03930bdd97a6bf6978cd1bdbeb579a50e1066933972b563c15ab62185a4ed8733aa2673f6b86c0877e3b9ce38d3ac5b3327876bf55bd9dd1734
+EBUILD raspberrypi-sources-6.1.21_p20230405.ebuild 1495 BLAKE2B 4dea392a8c82697cb7dae9e3311da1010bc3eed3351a82dc0ab4893f2891a45c2deab6661a20bc0e7fd13216e96aa379a4d419b54ec2051920fdcd4e09c7340d SHA512 e149e57197d842e95b4c338ab06c82313b790411678a00125f6d51409b5f10d9570be2328221e3d6e0584204b2c9a65a43ecfa5d181a3b1102ae4382478321eb
 MISC metadata.xml 582 BLAKE2B 1fd65837f58fbd7cb5661e3f9f28c6dcdf45d9b83b59fe026c1532fc0a6d71fd44ea74fe1036c5a8ac93bcb4b3497fb0687f322e5ec687ca52dd298f5aef5022 SHA512 15bd3a4efcde129b4542793134434292dbbfa1297f06392c175f6beb4ccf9e2b85274bc75a090be7414b6480e401cb455c86f8d2937acc6e008335038ad199fb
diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.1.21_p20230405.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.1.21_p20230405.ebuild
new file mode 100644
index 000000000000..c64869addb18
--- /dev/null
+++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-6.1.21_p20230405.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ETYPE=sources
+K_DEFCONFIG="bcmrpi_defconfig"
+K_SECURITY_UNSUPPORTED=1
+EXTRAVERSION="-${PN}/-*"
+
+K_EXP_GENPATCHES_NOUSE=1
+K_GENPATCHES_VER=25
+K_DEBLOB_AVAILABLE=0
+K_WANT_GENPATCHES="base extras"
+
+inherit kernel-2 linux-info
+detect_version
+detect_arch
+
+MY_P=$(ver_cut 4-)
+MY_P="1.${MY_P/p/}"
+
+DESCRIPTION="Raspberry Pi kernel sources"
+HOMEPAGE="https://github.com/raspberrypi/linux"
+SRC_URI="
+	https://github.com/raspberrypi/linux/archive/${MY_P}.tar.gz -> linux-${KV_FULL}.tar.gz
+	${GENPATCHES_URI}
+"
+
+KEYWORDS="~arm ~arm64"
+
+PATCHES=("${FILESDIR}"/${PN}-5.15.32-gentoo-kconfig.patch)
+
+UNIPATCH_EXCLUDE="
+	10*
+	15*
+	2000
+	29*
+	3000
+	4567"
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the raspberrypi developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+universal_unpack() {
+	unpack linux-${KV_FULL}.tar.gz
+
+	# We want to rename the unpacked directory to a nice normalised string
+	# bug #762766
+	mv "${WORKDIR}"/linux-${MY_P} "${WORKDIR}"/linux-${KV_FULL} || die
+
+	# remove all backup files
+	find . -iname "*~" -exec rm {} \; 2>/dev/null
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}