aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2018-07-15 23:45:49 +0100
committerBen Hutchings <ben@decadent.org.uk>2018-07-15 23:45:49 +0100
commit29f1a23722330dd6ce355d5b768c0056f0ecbbb4 (patch)
tree0650f50dc91ca0a6e7cf0eb8d5d927644be05a4f /debian/patches
parentba1733832fd94334fc88847ee013c3d62be29009 (diff)
downloadkernel_replicant_linux-29f1a23722330dd6ce355d5b768c0056f0ecbbb4.tar.gz
kernel_replicant_linux-29f1a23722330dd6ce355d5b768c0056f0ecbbb4.tar.bz2
kernel_replicant_linux-29f1a23722330dd6ce355d5b768c0056f0ecbbb4.zip
init: Avoid ABI change for build salt
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/debian/init-avoid-abi-change-for-build-salt.patch24
-rw-r--r--debian/patches/series1
2 files changed, 25 insertions, 0 deletions
diff --git a/debian/patches/debian/init-avoid-abi-change-for-build-salt.patch b/debian/patches/debian/init-avoid-abi-change-for-build-salt.patch
new file mode 100644
index 000000000000..0b207ee9d942
--- /dev/null
+++ b/debian/patches/debian/init-avoid-abi-change-for-build-salt.patch
@@ -0,0 +1,24 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 15 Jul 2018 23:44:02 +0100
+Subject: init: Avoid ABI change for build salt
+Forwarded: not-needed
+
+<linux/build-salt.h> indirectly includes <linux/elf.h>, which
+apparently adds some type definitions that change the symbol
+version for init_uts_ns.
+
+Hide this change from genksyms.
+
+---
+--- a/init/version.c
++++ b/init/version.c
+@@ -7,7 +7,9 @@
+ */
+
+ #include <generated/compile.h>
++#ifndef __GENKSYMS__
+ #include <linux/build-salt.h>
++#endif
+ #include <linux/export.h>
+ #include <linux/uts.h>
+ #include <linux/utsname.h>
diff --git a/debian/patches/series b/debian/patches/series
index 02ee750f32e6..33de109fb631 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -161,3 +161,4 @@ debian/wireless-disable-regulatory.db-direct-loading.patch
# ABI maintenance
debian/hid-avoid-abi-change-in-4.17.6.patch
debian/dax-avoid-abi-change-in-4.17.6.patch
+debian/init-avoid-abi-change-for-build-salt.patch