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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C33E0138334 for ; Tue, 3 Dec 2019 13:34:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D01BE0855; Tue, 3 Dec 2019 13:34:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69A00E0819 for ; Tue, 3 Dec 2019 13:34:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5894134D732 for ; Tue, 3 Dec 2019 13:34:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C132D8BC for ; Tue, 3 Dec 2019 13:34:25 +0000 (UTC) From: "Andrey Utkin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Utkin" Message-ID: <1575379932.1618c312961d281be9e971e8040d41e6423b2554.andrey_utkin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/raspberrypi-firmware/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild X-VCS-Directories: sys-boot/raspberrypi-firmware/ X-VCS-Committer: andrey_utkin X-VCS-Committer-Name: Andrey Utkin X-VCS-Revision: 1618c312961d281be9e971e8040d41e6423b2554 X-VCS-Branch: master Date: Tue, 3 Dec 2019 13:34: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: ea821b04-0098-4eef-99f6-bdb4280a2fa0 X-Archives-Hash: 2a4d1c50a5df3ead5fb0f95c76427657 commit: 1618c312961d281be9e971e8040d41e6423b2554 Author: Andrey Utkin gentoo org> AuthorDate: Mon Nov 25 18:54:39 2019 +0000 Commit: Andrey Utkin gentoo org> CommitDate: Tue Dec 3 13:32:12 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1618c312 sys-boot/raspberrypi-firmware: don't install device tree blobs Upstream git repo provides binaries of two natures in a single repository: * boot firmware files; * prebuilt kernel files. boot/*.dtb, boot/overlays/ belong to kernel, not boot firmware. But for historical reasons, these files were installed by sys-boot/raspberrypi-firmware package rather than sys-kernel/raspberrypi-image, which would be more correct. The problem with this is that users of kernels different than sys-kernel/raspberrypi-image need to install different files into these locations. This means such people have to avoid using sys-boot/raspberrypi-firmware package completely. A blocker dependency on old sys-kernel/raspberrypi-image versions is added to protect from a situation when just raspberrypi-firmware is being upgraded, and the machine ends up not having device tree files. Upgrading to a new version may cause a disruption if the user doesn't use sys-kernel/raspberrypi-image but still relies on device tree files installed by raspberrypi-firmware package. This will be dealt with by a news item. A special USE flag for smooth transition of such users is considered an overkill, on presumption that this package is not massively popular. Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Andrey Utkin gentoo.org> sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild index 4b06dfa4993..e1ebbe9b7e4 100644 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild +++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild @@ -10,6 +10,12 @@ 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" @@ -45,8 +51,6 @@ src_install() { insinto /boot cd boot || die doins bootcode.bin fixup*.dat start*elf - doins *.dtb - doins -r overlays newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}