From: "Sam James" <sam@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: Tue, 16 Nov 2021 12:06:09 +0000 (UTC) [thread overview]
Message-ID: <1637064353.55743ff045f0e8fdbfec92d92d7913e45c5663ec.sam@gentoo> (raw)
commit: 55743ff045f0e8fdbfec92d92d7913e45c5663ec
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 12:05:53 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 12:05:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55743ff0
sys-boot/systemd-boot: fix build with linux-headers-5.15
Closes: https://bugs.gentoo.org/823810
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 22 ++++++++++++++++++++++
sys-boot/systemd-boot/systemd-boot-249.ebuild | 1 +
2 files changed, 23 insertions(+)
--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
new file mode 100644
index 000000000000..398119d77432
--- /dev/null
+++ b/sys-boot/systemd-boot/files/249-linux-headers-5-15.patch
@@ -0,0 +1,22 @@
+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.ebuild
index d9ed991ef5c6..6a1255a2e06b 100644
--- a/sys-boot/systemd-boot/systemd-boot-249.ebuild
+++ b/sys-boot/systemd-boot/systemd-boot-249.ebuild
@@ -50,6 +50,7 @@ S="${WORKDIR}/systemd-${PV}"
PATCHES=(
"${FILESDIR}/249-libshared-static.patch"
+ "${FILESDIR}/249-linux-headers-5-15.patch"
)
src_configure() {
next reply other threads:[~2021-11-16 12:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-16 12:06 Sam James [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-18 20:56 Mike Gilbert
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=1637064353.55743ff045f0e8fdbfec92d92d7913e45c5663ec.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