From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/raspberrypi-firmware/
Date: Mon, 23 Nov 2020 05:01:01 +0000 (UTC) [thread overview]
Message-ID: <1606107654.8d3b254fc21d48751b4fb814cc88ce39595d3aa2.sam@gentoo> (raw)
commit: 8d3b254fc21d48751b4fb814cc88ce39595d3aa2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 05:00:54 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 05:00:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3b254f
sys-boot/raspberrypi-firmware: QA & style fixups
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../raspberrypi-firmware-1.20201022.ebuild | 61 +++++++++++-----------
.../raspberrypi-firmware-9999.ebuild | 61 +++++++++++-----------
2 files changed, 60 insertions(+), 62 deletions(-)
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
index b2767ce8051..7fe926ad782 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
@@ -5,17 +5,6 @@ EAPI=7
inherit mount-boot readme.gentoo-r1
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
-# Temporary safety measure to prevent ending up with a pair of
-# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
-# none of which installed device tree files.
-# Remove when the mentioned version and all older ones are deleted.
-RDEPEND="!<=sys-kernel/raspberrypi-image-4.19.57_p20190709"
-
if [[ "${PV}" == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
@@ -26,30 +15,20 @@ else
S="${WORKDIR}/firmware-${PV}"
fi
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
RESTRICT="binchecks strip"
-pkg_preinst() {
- if [ -z "${REPLACING_VERSIONS}" ] ; then
- local msg=""
- if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
- msg+="/boot/cmdline.txt "
- fi
- if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
- msg+="/boot/config.txt "
- fi
- if [ -n "${msg}" ] ; then
- msg="This package installs following files: ${msg}."
- msg="${msg} Please remove(backup) your copies durning install"
- msg="${msg} and merge settings afterwards."
- msg="${msg} Further updates will be CONFIG_PROTECTed."
- die "${msg}"
- fi
- fi
-}
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
src_prepare() {
default
+
cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
if use arm64; then
# Force selection of the 64-bit kernel8.img to match our userland
echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
@@ -66,8 +45,28 @@ src_install() {
readme.gentoo_create_doc
}
+pkg_preinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ local msg=""
+
+ if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+ msg+="/boot/cmdline.txt "
+ fi
+
+ if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+ msg+="/boot/config.txt "
+ fi
+
+ if [[ -n "${msg}" ]] ; then
+ msg="This package installs following files: ${msg}."
+ msg="${msg} Please remove (backup) your copies durning install"
+ msg="${msg} and merge settings afterwards."
+ msg="${msg} Further updates will be CONFIG_PROTECTed."
+ die "${msg}"
+ fi
+ fi
+}
+
pkg_postinst() {
readme.gentoo_print_elog
}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index b2767ce8051..7fe926ad782 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -5,17 +5,6 @@ EAPI=7
inherit mount-boot readme.gentoo-r1
-DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
-HOMEPAGE="https://github.com/raspberrypi/firmware"
-LICENSE="GPL-2 raspberrypi-videocore-bin"
-SLOT="0"
-
-# Temporary safety measure to prevent ending up with a pair of
-# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
-# none of which installed device tree files.
-# Remove when the mentioned version and all older ones are deleted.
-RDEPEND="!<=sys-kernel/raspberrypi-image-4.19.57_p20190709"
-
if [[ "${PV}" == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
@@ -26,30 +15,20 @@ else
S="${WORKDIR}/firmware-${PV}"
fi
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
RESTRICT="binchecks strip"
-pkg_preinst() {
- if [ -z "${REPLACING_VERSIONS}" ] ; then
- local msg=""
- if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then
- msg+="/boot/cmdline.txt "
- fi
- if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then
- msg+="/boot/config.txt "
- fi
- if [ -n "${msg}" ] ; then
- msg="This package installs following files: ${msg}."
- msg="${msg} Please remove(backup) your copies durning install"
- msg="${msg} and merge settings afterwards."
- msg="${msg} Further updates will be CONFIG_PROTECTed."
- die "${msg}"
- fi
- fi
-}
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
src_prepare() {
default
+
cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
if use arm64; then
# Force selection of the 64-bit kernel8.img to match our userland
echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
@@ -66,8 +45,28 @@ src_install() {
readme.gentoo_create_doc
}
+pkg_preinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ local msg=""
+
+ if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+ msg+="/boot/cmdline.txt "
+ fi
+
+ if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+ msg+="/boot/config.txt "
+ fi
+
+ if [[ -n "${msg}" ]] ; then
+ msg="This package installs following files: ${msg}."
+ msg="${msg} Please remove (backup) your copies durning install"
+ msg="${msg} and merge settings afterwards."
+ msg="${msg} Further updates will be CONFIG_PROTECTed."
+ die "${msg}"
+ fi
+ fi
+}
+
pkg_postinst() {
readme.gentoo_print_elog
}
-
-DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
next reply other threads:[~2020-11-23 5:01 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-23 5:01 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-24 14:55 [gentoo-commits] repo/gentoo:master commit in: sys-boot/raspberrypi-firmware/ Viorel Munteanu
2024-10-24 11:42 Viorel Munteanu
2024-09-07 12:04 Viorel Munteanu
2024-09-06 8:58 Viorel Munteanu
2024-09-06 8:58 Viorel Munteanu
2024-04-20 3:20 Sam James
2023-03-24 13:45 Arthur Zamarin
2023-03-10 6:02 Dennis Lamm
2023-03-04 6:36 Arthur Zamarin
2023-03-04 6:03 Arthur Zamarin
2023-02-02 20:05 Dennis Lamm
2023-02-02 20:05 Dennis Lamm
2022-12-22 11:10 Dennis Lamm
2022-12-22 11:10 Dennis Lamm
2022-10-24 17:16 Dennis Lamm
2022-10-24 17:16 Dennis Lamm
2022-10-24 17:16 Dennis Lamm
2022-04-17 16:44 Sam James
2022-04-09 19:58 Arthur Zamarin
2022-04-09 19:57 Arthur Zamarin
2022-04-06 6:57 Dennis Lamm
2022-02-20 5:51 Sam James
2021-12-14 20:47 Arthur Zamarin
2021-12-14 2:06 Sam James
2021-12-05 1:28 Sam James
2021-11-21 8:21 Sam James
2021-06-21 22:36 Sam James
2021-03-06 7:26 Sam James
2021-03-05 20:34 Sam James
2021-01-27 7:31 Sam James
2021-01-25 14:06 Sam James
2021-01-25 14:04 Sam James
2020-12-20 6:29 Sam James
2020-12-11 22:12 Sam James
2020-12-11 21:35 Dennis Lamm
2020-12-10 17:43 Sam James
2020-11-23 4:54 Sam James
2020-07-28 0:10 Sam James
2019-12-30 22:33 Andrey Utkin
2019-12-03 13:34 Andrey Utkin
2019-12-03 13:34 Andrey Utkin
2019-07-15 20:31 Andrey Utkin
2019-07-05 21:38 Andrey Utkin
2019-03-25 23:07 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2019-03-24 19:18 Andrey Utkin
2017-10-15 9:21 Michael Palimaka
2016-03-15 13:49 Michael Weber
2016-02-19 21:55 Michael Weber
2016-02-19 21:55 Michael Weber
2015-11-29 20:22 Alfredo Tupone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1606107654.8d3b254fc21d48751b4fb814cc88ce39595d3aa2.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox