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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CACB158086 for ; Sun, 14 Nov 2021 08:02:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C96B02BC031; Sun, 14 Nov 2021 08:02:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7A742BC031 for ; Sun, 14 Nov 2021 08:02:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 609553434A6 for ; Sun, 14 Nov 2021 08:02:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F694164 for ; Sun, 14 Nov 2021 08:02:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1636876956.ac2e319813282c3a79c1a704aee66387bc10a149.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/udev/files/, sys-fs/udev/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/udev/files/249-udev-linux-headers-5-15.patch sys-fs/udev/udev-249-r3.ebuild X-VCS-Directories: sys-fs/udev/ sys-fs/udev/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ac2e319813282c3a79c1a704aee66387bc10a149 X-VCS-Branch: master Date: Sun, 14 Nov 2021 08:02:45 +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: 1ac9d230-de83-46d9-9388-ad976484a475 X-Archives-Hash: bb376101ba77c2d4f5da2198b842b6ee commit: ac2e319813282c3a79c1a704aee66387bc10a149 Author: Sam James gentoo org> AuthorDate: Sun Nov 14 08:02:21 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 14 08:02:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac2e3198 sys-fs/udev: fix build with linux-headers-5.15 Just like tmpfiles and systemd itself. Closes: https://bugs.gentoo.org/821550 Signed-off-by: Sam James gentoo.org> .../udev/files/249-udev-linux-headers-5-15.patch | 22 ++++++++++++++++++++++ sys-fs/udev/udev-249-r3.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/sys-fs/udev/files/249-udev-linux-headers-5-15.patch b/sys-fs/udev/files/249-udev-linux-headers-5-15.patch new file mode 100644 index 000000000000..844099b72819 --- /dev/null +++ b/sys-fs/udev/files/249-udev-linux-headers-5-15.patch @@ -0,0 +1,22 @@ +https://github.com/systemd/systemd-stable/pull/132/commits/92bbfcdc733d39ec4097d8678bc92a7aaaf78ae1.patch +https://bugs.gentoo.org/821550 + +From: Chris Packham +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-fs/udev/udev-249-r3.ebuild b/sys-fs/udev/udev-249-r3.ebuild index 2e1601d89e08..d8c084d97863 100644 --- a/sys-fs/udev/udev-249-r3.ebuild +++ b/sys-fs/udev/udev-249-r3.ebuild @@ -116,6 +116,7 @@ src_prepare() { # backport from 250 to silence musl warnings "${FILESDIR}/249-sys-include-posix.patch" "${FILESDIR}/249-libudev-static.patch" + "${FILESDIR}/249-udev-linux-headers-5-15.patch" ) use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches )