public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/
Date: Thu, 18 Nov 2021 20:56:53 +0000 (UTC)	[thread overview]
Message-ID: <1637269010.63f94351d52a140018ec2f9432131a3c8a3327bd.floppym@gentoo> (raw)

commit:     63f94351d52a140018ec2f9432131a3c8a3327bd
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 20:55:41 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 20:56:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f94351

sys-boot/systemd-boot: add 249.6, drop 249

Closes: https://bugs.gentoo.org/824026
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/systemd-boot/Manifest                     |  2 +-
 .../files/249-linux-headers-5-15.patch             | 22 ----------------------
 ...d-boot-249.ebuild => systemd-boot-249.6.ebuild} | 11 +++++++----
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 209a35c38f4e..ec8fbe294598 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1 +1 @@
-DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
+DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f

diff --git a/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch b/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch
deleted file mode 100644
index 398119d77432..000000000000
--- a/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/systemd/systemd-stable/pull/132/commits/92bbfcdc733d39ec4097d8678bc92a7aaaf78ae1.patch
-https://bugs.gentoo.org/823810
-
-From: Chris Packham <chris.packham@alliedtelesis.co.nz>
-Date: Fri, 10 Sep 2021 09:51:36 +1200
-Subject: [PATCH 1/2] basic/linux: Sync if_arp.h with Linux 5.14
-
-ARPHRD_MCTP was added in 5.14. Sync if_arp.h to pick up the definition
-
-Fixes #20694
-
-(cherry picked from commit 7c5b9952c4f6e2b72f90edbe439982528b7cf223)
---- a/src/basic/linux/if_arp.h
-+++ b/src/basic/linux/if_arp.h
-@@ -54,6 +54,7 @@
- #define ARPHRD_X25	271		/* CCITT X.25			*/
- #define ARPHRD_HWX25	272		/* Boards with X.25 in firmware	*/
- #define ARPHRD_CAN	280		/* Controller Area Network      */
-+#define ARPHRD_MCTP	290
- #define ARPHRD_PPP	512
- #define ARPHRD_CISCO	513		/* Cisco HDLC	 		*/
- #define ARPHRD_HDLC	ARPHRD_CISCO

diff --git a/sys-boot/systemd-boot/systemd-boot-249.ebuild b/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
similarity index 89%
rename from sys-boot/systemd-boot/systemd-boot-249.ebuild
rename to sys-boot/systemd-boot/systemd-boot-249.6.ebuild
index 6a1255a2e06b..8ae443c2d75f 100644
--- a/sys-boot/systemd-boot/systemd-boot-249.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
@@ -8,7 +8,13 @@ inherit meson python-any-r1 toolchain-funcs
 
 DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+if [[ ${PV} == *.* ]]; then
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> systemd-stable-${PV}.tar.gz"
+	S="${WORKDIR}/systemd-stable-${PV}"
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+	S="${WORKDIR}/systemd-${PV}"
+fi
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
@@ -46,11 +52,8 @@ RDEPEND="${COMMON_DEPEND}
 QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
 QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
 
-S="${WORKDIR}/systemd-${PV}"
-
 PATCHES=(
 	"${FILESDIR}/249-libshared-static.patch"
-	"${FILESDIR}/249-linux-headers-5-15.patch"
 )
 
 src_configure() {


             reply	other threads:[~2021-11-18 20:56 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-18 20:56 Mike Gilbert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-10-28  7:41 [gentoo-commits] repo/gentoo:master commit in: sys-boot/systemd-boot/, sys-boot/systemd-boot/files/ Sam James
2022-01-15 16:12 Mike Gilbert
2021-11-16 12:06 Sam James
2021-08-29 13:44 Mike Gilbert
2018-10-02 15:41 Mike Gilbert
2018-02-12 16:55 Mike Gilbert
2017-01-16 16:19 Mike Gilbert

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=1637269010.63f94351d52a140018ec2f9432131a3c8a3327bd.floppym@gentoo \
    --to=floppym@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