From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09D6C1581D3 for ; Thu, 16 May 2024 17:17:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36274E29B4; Thu, 16 May 2024 17:17:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 107B3E29B4 for ; Thu, 16 May 2024 17:17:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 105F3335C2E for ; Thu, 16 May 2024 17:17:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6EC5D132F for ; Thu, 16 May 2024 17:17:25 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1715879833.079b4bf8a72c980f8ef7e5867ebfff1d11e421d5.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/raspberrypi-image/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/raspberrypi-image/Manifest sys-kernel/raspberrypi-image/metadata.xml sys-kernel/raspberrypi-image/raspberrypi-image-6.6.28_p20240424.ebuild X-VCS-Directories: sys-kernel/raspberrypi-image/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 079b4bf8a72c980f8ef7e5867ebfff1d11e421d5 X-VCS-Branch: master Date: Thu, 16 May 2024 17:17:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ced03674-acea-4de0-95d4-0287b6196075 X-Archives-Hash: 95eead87aef3b9d3effaf275e51b1b28 commit: 079b4bf8a72c980f8ef7e5867ebfff1d11e421d5 Author: Viorel Munteanu gentoo org> AuthorDate: Thu May 16 17:15:45 2024 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Thu May 16 17:17:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079b4bf8 sys-kernel/raspberrypi-image: add 6.6.28_p20240424 Closes: https://bugs.gentoo.org/930269 Signed-off-by: Viorel Munteanu gentoo.org> sys-kernel/raspberrypi-image/Manifest | 1 + sys-kernel/raspberrypi-image/metadata.xml | 5 +- .../raspberrypi-image-6.6.28_p20240424.ebuild | 66 ++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest index 8aba2dbbe51b..1ffc5e43f59b 100644 --- a/sys-kernel/raspberrypi-image/Manifest +++ b/sys-kernel/raspberrypi-image/Manifest @@ -5,4 +5,5 @@ DIST raspberrypi-firmware-1.20210527.tar.gz 192247084 BLAKE2B 329707dfb2905b3692 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-firmware-1.20240424.tar.gz 153632287 BLAKE2B 7718d26ee66751484edd359412bc186d7ef5e68af97abe814b340b4c21fb4d6f7abc2caa8c7d0ec62ac742a9c932a08b4393d32d4ba79480c9648d742bead0b8 SHA512 90ad6872886f3efb004b57e258ba8ec0ef0bf619e251e2f0d259c22ef9cb816f6b0f2d5fb1f3a0ece13bf69fecfe8fe70793b90ea243163b5a585930e554e3d5 DIST raspberrypi-image-4.14.98_p20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193 diff --git a/sys-kernel/raspberrypi-image/metadata.xml b/sys-kernel/raspberrypi-image/metadata.xml index d80bc1f56348..a5a248c9d8e9 100644 --- a/sys-kernel/raspberrypi-image/metadata.xml +++ b/sys-kernel/raspberrypi-image/metadata.xml @@ -1,7 +1,10 @@ - + + ceamac@gentoo.org + Viorel Munteanu + raspberrypi/firmware diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-6.6.28_p20240424.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-6.6.28_p20240424.ebuild new file mode 100644 index 000000000000..8a8a4752bce4 --- /dev/null +++ b/sys-kernel/raspberrypi-image/raspberrypi-image-6.6.28_p20240424.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 +}