Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
systemd
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pkg
systemd
Commits
ae334b69
Commit
ae334b69
authored
3 years ago
by
Ryan Gonzalez
Browse files
Options
Downloads
Patches
Plain Diff
Fix compilation on kernel 5.14+
https://phabricator.apertis.org/T8162
Signed-off-by:
Ryan Gonzalez
<
ryan.gonzalez@collabora.com
>
parent
cece6feb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
5 merge requests
!76
v2022pre ← v2023dev1 backport: Fix /var unmounting and compilation on kernel 5.14+
,
!75
v2023dev0 ← v2023dev1 backport: Fix /var unmounting and compilation on kernel 5.14+
,
!74
v2022 ← v2023dev1 backport: Fix /var unmounting and compilation on kernel 5.14+
,
!72
Remove '-execdir +' usage for compatibility with rust-findutils
,
!71
Fix compilation on kernel 5.14+
Pipeline
#336267
passed
3 years ago
Stage: build-env
Stage: build
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
debian/changelog
+7
-0
7 additions, 0 deletions
debian/changelog
debian/patches/apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch
+23
-0
23 additions, 0 deletions
...s/apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch
debian/patches/series
+1
-0
1 addition, 0 deletions
debian/patches/series
with
31 additions
and
0 deletions
debian/changelog
+
7
−
0
View file @
ae334b69
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:
...
...
This diff is collapsed.
Click to expand it.
debian/patches/apertis/basic-linux-Sync-if_arp.h-with-Linux-5.14.patch
0 → 100644
+
23
−
0
View file @
ae334b69
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
This diff is collapsed.
Click to expand it.
debian/patches/series
+
1
−
0
View file @
ae334b69
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment