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 4BE5A138334 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 834DDE07F6; 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 423EBE07F6 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 E7E4734D72F for ; Tue, 3 Dec 2019 13:34:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D474C8C9 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: <1575379936.b8e400e247f95542ea116b4c5c1d4675c12dfc5e.andrey_utkin@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/raspberrypi-image-9999.ebuild X-VCS-Directories: sys-kernel/raspberrypi-image/ X-VCS-Committer: andrey_utkin X-VCS-Committer-Name: Andrey Utkin X-VCS-Revision: b8e400e247f95542ea116b4c5c1d4675c12dfc5e 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: ab8ed7ff-1405-439e-bc3c-f609438343ee X-Archives-Hash: d0c4e7e4b479e2323625fb63243b241f commit: b8e400e247f95542ea116b4c5c1d4675c12dfc5e Author: Andrey Utkin gentoo org> AuthorDate: Mon Nov 25 19:23:29 2019 +0000 Commit: Andrey Utkin gentoo org> CommitDate: Tue Dec 3 13:32:16 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e400e2 sys-kernel/raspberrypi-image: 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-boot/raspberrypi-firmware versions is added to protect from a situation when just raspberrypi-image is being upgraded, and a package manager ends up with a file collision during installation phase. Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Andrey Utkin gentoo.org> sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild index ecd30c09574..3a9901ac43d 100644 --- a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild +++ b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild @@ -11,7 +11,12 @@ LICENSE="GPL-2 raspberrypi-videocore-bin" SLOT="0" RESTRICT="binchecks strip" -RDEPEND="sys-boot/raspberrypi-firmware" +# 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" if [[ "${PV}" == 9999 ]]; then inherit git-r3 @@ -30,4 +35,7 @@ src_install() { doins -r modules/* insinto /boot doins boot/*.img + + doins boot/*.dtb + doins -r boot/overlays }