diff --git a/debian/changelog b/debian/changelog index 9ef23dad9482ec9659eecaf301e5cd18b63f3770..25d13ec2ec2a7c8076375ee840cd8d7d553e5a3e 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 0000000000000000000000000000000000000000..5a8d981091e36bafb59379af524cb5989f3563a2 --- /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 51903b5f6d5a5f3ce980aff3799ed1f1e31f43aa..af5a7aa2ea42855f4071ae5b0364bf0bee07cd0e 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