commit: fec1fa38a05d59d47b6c3e10b447c4591d0a1120
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 15 19:19:18 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Dec 15 20:08:28 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec1fa38
sys-kernel/raspberrypi-image: sync live ebuild
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../raspberrypi-image-6.12.47_p20250915.ebuild | 26 ++++++++--------
.../raspberrypi-image-9999.ebuild | 35 ++++++++++------------
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git
a/sys-kernel/raspberrypi-image/raspberrypi-image-6.12.47_p20250915.ebuild
b/sys-kernel/raspberrypi-image/raspberrypi-image-6.12.47_p20250915.ebuild
index 36f55e45d50d..2fc3df290b46 100644
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-6.12.47_p20250915.ebuild
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-6.12.47_p20250915.ebuild
@@ -41,21 +41,23 @@ RDEPEND="sys-boot/raspberrypi-firmware"
src_prepare() {
default
- local expected_kernel_version="$(ver_cut 1-3)+"
- local found_kernel_version=( "${S}"/modules/$(ver_cut 1).*.*+ )
+ if [[ ${PV} != 9999 ]]; then
+ 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##*/}
+ 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 [[ ${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!"
+ if [[ ! -d "${S}"/modules/${expected_kernel_version} ]] ; then
+ eerror "Kernel module directory is missing!"
+ die "${S}/modules/${expected_kernel_version} not found!"
+ fi
fi
}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
index c63fac44773a..ea16409df898 100644
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,31 +27,28 @@ 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"
+RDEPEND="sys-boot/raspberrypi-firmware"
src_prepare() {
default
- local expected_kernel_version="$(ver_cut 1-3)+"
- local found_kernel_version=( "${S}"/modules/$(ver_cut 1).*.*+ )
+ if [[ ${PV} != 9999 ]]; then
+ 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##*/}
+ 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 [[ ${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!"
+ if [[ ! -d "${S}"/modules/${expected_kernel_version} ]] ; then
+ eerror "Kernel module directory is missing!"
+ die "${S}/modules/${expected_kernel_version} not found!"
+ fi
fi
}
