commit: 1f05f0de465c5142cc127023f6e9c978993a2ef7
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 20:30:57 2026 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 14:01:54 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f05f0de
sys-boot/raspberrypi-firmware: fix merging in $ROOT
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../raspberrypi-firmware-1.20230106.ebuild | 6 +++---
.../raspberrypi-firmware-1.20240902.ebuild | 6 +++---
.../raspberrypi-firmware-1.20250915.ebuild | 4 ++--
.../raspberrypi-firmware/raspberrypi-firmware-9999.ebuild | 11 ++++++-----
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git
a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20230106.ebuild
b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20230106.ebuild
index dbe8072f5d1d..971ae8f47790 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20230106.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20230106.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -49,11 +49,11 @@ pkg_preinst() {
if [[ -z "${REPLACING_VERSIONS}" ]] ; then
local msg=""
- if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt
]] ; then
+ if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e
"${ROOT}"/boot/cmdline.txt ]] ; then
msg+="/boot/cmdline.txt "
fi
- if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt
]] ; then
+ if [[ -e "${ED}"/boot/config.txt ]] && [[ -e
"${ROOT}"/boot/config.txt ]] ; then
msg+="/boot/config.txt "
fi
diff --git
a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20240902.ebuild
b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20240902.ebuild
index 34b25d3d71c5..2f971cf0ce91 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20240902.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20240902.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -50,11 +50,11 @@ pkg_preinst() {
if [[ -z "${REPLACING_VERSIONS}" ]] ; then
local msg=""
- if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt
]] ; then
+ if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e
"${ROOT}"/boot/cmdline.txt ]] ; then
msg+="/boot/cmdline.txt "
fi
- if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt
]] ; then
+ if [[ -e "${ED}"/boot/config.txt ]] && [[ -e
"${ROOT}"/boot/config.txt ]] ; then
msg+="/boot/config.txt "
fi
diff --git
a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20250915.ebuild
b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20250915.ebuild
index b87f53af186e..be00b286015f 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20250915.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20250915.ebuild
@@ -50,11 +50,11 @@ pkg_preinst() {
if [[ -z "${REPLACING_VERSIONS}" ]] ; then
local msg=""
- if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt
]] ; then
+ if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e
"${ROOT}"/boot/cmdline.txt ]] ; then
msg+="/boot/cmdline.txt "
fi
- if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt
]] ; then
+ if [[ -e "${ED}"/boot/config.txt ]] && [[ -e
"${ROOT}"/boot/config.txt ]] ; then
msg+="/boot/config.txt "
fi
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index 595de0624e7e..dc3a4e72b3b9 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,9 +18,10 @@ fi
DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
HOMEPAGE="https://github.com/raspberrypi/firmware";
-LICENSE="GPL-2 raspberrypi-videocore-bin"
+LICENSE="raspberrypi-videocore-bin"
SLOT="0"
-RESTRICT="binchecks strip"
+RESTRICT="strip"
+QA_PREBUILT="*"
DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
@@ -49,11 +50,11 @@ pkg_preinst() {
if [[ -z "${REPLACING_VERSIONS}" ]] ; then
local msg=""
- if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt
]] ; then
+ if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e
"${ROOT}"/boot/cmdline.txt ]] ; then
msg+="/boot/cmdline.txt "
fi
- if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt
]] ; then
+ if [[ -e "${ED}"/boot/config.txt ]] && [[ -e
"${ROOT}"/boot/config.txt ]] ; then
msg+="/boot/config.txt "
fi
