[gentoo-commits] repo/gentoo:master commit in: sys-kernel/raspberrypi-sources/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/raspberrypi-sources/
Date: Mon, 22 Mar 2021 05:22:21 +0000 (UTC)	[thread overview]
Message-ID: <1616390512.2be341e38bae40dc056de898bca6e2f457432985.sam@gentoo> (raw)

commit:     2be341e38bae40dc056de898bca6e2f457432985
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Sun Feb 14 19:04:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 05:21:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be341e3

sys-kernel/raspberrypi-sources: fix USE=symlink redux

Previous symlink fix was intended for 5.4.79 but was applied
only to 5.10.11 then broken by the source renaming.

As a replacement fix, no longer set KV_FULL which works
out thanks to the source renaming.

Fixes: 13879e90b2639feb21725785ec5070b79e5d8757
Fixes: 40696e5680e8d00928e9ebca1fea5c4ed2035673
Closes: https://bugs.gentoo.org/770460
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../raspberrypi-sources-5.10.11_p20210201.ebuild         | 11 ++++-------
 ...ld => raspberrypi-sources-5.4.79_p20201201-r1.ebuild} | 16 +++++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.10.11_p20210201.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.10.11_p20210201.ebuild
index c5517098fc5..1da726507e4 100644
--- a/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.10.11_p20210201.ebuild
+++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.10.11_p20210201.ebuild
@@ -6,19 +6,16 @@ EAPI=6
 ETYPE=sources
 K_DEFCONFIG="bcmrpi_defconfig"
 K_SECURITY_UNSUPPORTED=1
-EXTRAVERSION="-${PN}/-*"
 
 inherit kernel-2 eapi7-ver
 detect_version
-detect_arch
 
-KV_FULL=$(ver_cut 4-)
-KV_FULL="raspberrypi-kernel_1.${KV_FULL/p/}-1"
+MY_P=$(ver_cut 4-)
+MY_P="raspberrypi-kernel_1.${MY_P/p/}-1"
 
 DESCRIPTION="Raspberry Pi kernel sources"
 HOMEPAGE="https://github.com/raspberrypi/linux"
-SRC_URI="https://github.com/raspberrypi/linux/archive/${KV_FULL}.tar.gz -> linux-${PV}-raspberrypi.tar.gz"
-S="${WORKDIR}/linux-${PV}-raspberrypi"
+SRC_URI="https://github.com/raspberrypi/linux/archive/${MY_P}.tar.gz -> linux-${KV_FULL}.tar.gz"
 
 KEYWORDS="~arm ~arm64"
 
@@ -27,5 +24,5 @@ src_unpack() {
 
 	# We want to rename the unpacked directory to a nice normalised string
 	# bug #762766
-	mv "${WORKDIR}"/linux-${KV_FULL} "${WORKDIR}"/linux-${PV}-raspberrypi || die
+	mv "${WORKDIR}"/linux-${MY_P} "${WORKDIR}"/linux-${KV_FULL} || die
 }

diff --git a/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.79_p20201201.ebuild b/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.79_p20201201-r1.ebuild
similarity index 50%
rename from sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.79_p20201201.ebuild
rename to sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.79_p20201201-r1.ebuild
index de796c6696a..9ce67ae0b2a 100644
--- a/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.79_p20201201.ebuild
+++ b/sys-kernel/raspberrypi-sources/raspberrypi-sources-5.4.79_p20201201-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,21 +6,23 @@ EAPI=6
 ETYPE=sources
 K_DEFCONFIG="bcmrpi_defconfig"
 K_SECURITY_UNSUPPORTED=1
-EXTRAVERSION="-${PN}/-*"
 
 inherit kernel-2 eapi7-ver
 detect_version
-detect_arch
 
-MY_PV=$(ver_cut 4-)
-MY_PV=${MY_PV/p/}
+MY_P=$(ver_cut 4-)
+MY_P="raspberrypi-kernel_1.${MY_P/p/}-1"
+
 DESCRIPTION="Raspberry Pi kernel sources"
 HOMEPAGE="https://github.com/raspberrypi/linux"
-SRC_URI="https://github.com/raspberrypi/linux/archive/raspberrypi-kernel_1.${MY_PV}-1.tar.gz"
-S="${WORKDIR}/linux-raspberrypi-kernel_1.${MY_PV}-1"
+SRC_URI="https://github.com/raspberrypi/linux/archive/${MY_P}.tar.gz"
 
 KEYWORDS="~arm ~arm64"
 
 src_unpack() {
 	default
+
+	# We want to rename the unpacked directory to a nice normalised string
+	# bug #762766
+	mv "${WORKDIR}"/linux-${MY_P} "${WORKDIR}"/linux-${KV_FULL} || die
 }

next             reply	other threads:[~2021-03-22  5:22 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-22  5:22 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-28  4:56 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/raspberrypi-sources/ Dennis Lamm
2024-10-12  9:44 Michał Górny
2024-10-12  9:44 Michał Górny
2024-09-03 17:36 Viorel Munteanu
2024-09-03 17:22 Viorel Munteanu
2024-08-23 13:00 Arthur Zamarin
2024-08-13 16:08 Arthur Zamarin
2024-07-12 16:57 Viorel Munteanu
2024-07-12 16:57 Viorel Munteanu
2024-04-20  3:20 Sam James
2023-12-30  3:04 Sam James
2023-12-30  3:04 Sam James
2023-06-07 16:39 Sam James
2023-03-24 14:14 Arthur Zamarin
2023-03-10  6:02 Dennis Lamm
2023-03-04  6:04 Arthur Zamarin
2023-03-04  5:47 Arthur Zamarin
2023-02-02 19:54 Dennis Lamm
2023-02-02 19:54 Dennis Lamm
2023-01-05  5:50 Dennis Lamm
2023-01-05  5:50 Dennis Lamm
2023-01-05  5:50 Dennis Lamm
2022-10-28  6:33 Dennis Lamm
2022-04-26  4:47 Dennis Lamm
2022-04-26  4:47 Dennis Lamm
2022-04-09 19:46 Arthur Zamarin
2022-04-09 19:36 Arthur Zamarin
2022-04-06  6:57 Dennis Lamm
2022-04-06  6:57 Dennis Lamm
2022-03-22  1:54 Sam James
2021-12-05  1:29 Sam James
2021-12-05  1:28 Sam James
2021-12-05  1:28 Sam James
2021-09-03  1:53 Sam James
2021-02-05 18:51 Sam James
2021-02-05 18:51 Sam James
2021-02-05 18:51 Sam James
2021-02-05 18:51 Sam James
2020-12-07 18:05 Sam James
2020-07-28  0:10 Sam James
2019-12-04 23:23 Andrey Utkin
2019-12-04 23:23 Andrey Utkin
2019-12-04 23:23 Andrey Utkin
2019-12-04 23:23 Andrey Utkin
2019-12-04 23:23 Andrey Utkin
2019-01-11  8:29 Georgy Yakovlev
2018-01-04 17:43 Patrice Clement
2017-12-07 23:04 Steve Arnold
2017-12-07 20:38 Steve Arnold
2017-12-03 15:52 Patrice Clement
2017-10-01  5:44 Alexey Shvetsov
2017-07-12 22:36 Alexey Shvetsov
2017-03-07  7:28 Michael Weber
2017-03-07  7:04 Michael Weber
2016-02-11  8:11 Michael Weber
2016-02-11  7:21 Michael Weber
2015-11-28 13:01 Alfredo Tupone

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:c5517098fc dfblob:1da726507e dfblob:de796c6696
dfblob:9ce67ae0b2 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-kernel/raspberrypi-sources/" )
	(help)

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=1616390512.2be341e38bae40dc056de898bca6e2f457432985.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