From ae334b69cfb6e1b552d2bcc72f659a49cd7f405f Mon Sep 17 00:00:00 2001 From: Ryan Gonzalez <ryan.gonzalez@collabora.com> Date: Wed, 12 Jan 2022 19:15:43 -0600 Subject: [PATCH] Fix compilation on kernel 5.14+ https://phabricator.apertis.org/T8162 Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com> --- debian/changelog | 7 ++++++ ...-linux-Sync-if_arp.h-with-Linux-5.14.patch | 23 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+) create mode 100644 debian/patches/apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch diff --git a/debian/changelog b/debian/changelog index 9ef23dad..25d13ec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +systemd (247.3-6+apertis2) apertis; urgency=medium + + * d/p/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch: + Fix compilation on kernel 5.14+ + + -- Ryan Gonzalez <ryan.gonzalez@collabora.com> Thu, 13 Jan 2022 15:27:00 -0600 + systemd (247.3-6+apertis1) apertis; urgency=medium * Merge from Debian Bullseye. Remaining changes: diff --git a/debian/patches/apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch b/debian/patches/apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch new file mode 100644 index 00000000..5a8d9810 --- /dev/null +++ b/debian/patches/apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch @@ -0,0 +1,23 @@ +From: Chris Packham <chris.packham@alliedtelesis.co.nz> +Date: Fri, 10 Sep 2021 09:51:36 +1200 +Subject: 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 +--- + src/basic/linux/if_arp.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/linux/if_arp.h b/src/basic/linux/if_arp.h +index c3cc5a9..4783af9 100644 +--- 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/debian/patches/series b/debian/patches/series index 51903b5f..af5a7aa2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,3 +39,4 @@ apertis/Reworked-kernel-install-script.patch apertis/Remove-bashisms-from-the-entry-directory-plugin.patch apertis/kernel-install-allow-to-create-BOOT-MACHINE_ID.patch apertis/Fix-the-path-to-bootable-binaries-in-efi-entry.patch +apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch -- GitLab