diff options
| author | Ben Hutchings <benh@debian.org> | 2020-08-25 23:35:53 +0100 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2020-08-25 23:39:10 +0100 |
| commit | 1b5c35d8f6a22f90813b385163a4639e1b3577d2 (patch) | |
| tree | 54631b4e9c8c25f47917a6b00513357f25f07a0f /debian | |
| parent | 3494be7a6f7b468c6417af0d27ee3d62d9ea6955 (diff) | |
| download | kernel_replicant_linux-1b5c35d8f6a22f90813b385163a4639e1b3577d2.tar.gz kernel_replicant_linux-1b5c35d8f6a22f90813b385163a4639e1b3577d2.tar.bz2 kernel_replicant_linux-1b5c35d8f6a22f90813b385163a4639e1b3577d2.zip | |
tools/include/uapi: Fix <asm/errno.h> (probably fixes FTBFS on ia64)
I don't understand why upstream is still expanding this
semi-functional parallel hierarchy of UAPI headers. The proper fix
would be to make tools depend on headers_install, and then:
git rm -rf tools/include/uapi tools/include/arch/*/uapi
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/bugfix/all/tools-include-uapi-fix-errno.h.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 579c57751fac..8a0b805dd685 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ linux (5.8.3-1~exp2) UNRELEASED; urgency=medium * [mips*] udeb: Drop hfs-modules (fixes FTBFS) * [m68k,powerpc,ppc64] udeb: Make hfs-modules depend on cdrom-core-modules (fixes FTBFS) + * tools/include/uapi: Fix <asm/errno.h> (probably fixes FTBFS on ia64) -- Ben Hutchings <benh@debian.org> Tue, 25 Aug 2020 19:33:26 +0100 diff --git a/debian/patches/bugfix/all/tools-include-uapi-fix-errno.h.patch b/debian/patches/bugfix/all/tools-include-uapi-fix-errno.h.patch new file mode 100644 index 000000000000..e9be5c1b3b64 --- /dev/null +++ b/debian/patches/bugfix/all/tools-include-uapi-fix-errno.h.patch @@ -0,0 +1,29 @@ +From: Ben Hutchings <benh@debian.org> +Date: Tue, 25 Aug 2020 23:27:40 +0100 +Subject: tools/include/uapi: Fix <asm/errno.h> + +tools/include/uapi/asm/errno.h currently attempts to include +non-existent arch-specific headers for ia64 and xtensa. Remove +these cases so that <asm-generic/errno.h> is used instead. + +It does not use the arch-specific header for parisc, so add a +case for that. + +References: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=ia64&ver=5.8.3-1%7Eexp1&stamp=1598340829&raw=1 +Signed-off-by: Ben Hutchings <benh@debian.org> +--- +--- a/tools/include/uapi/asm/errno.h ++++ b/tools/include/uapi/asm/errno.h +@@ -9,10 +9,8 @@ + #include "../../../arch/alpha/include/uapi/asm/errno.h" + #elif defined(__mips__) + #include "../../../arch/mips/include/uapi/asm/errno.h" +-#elif defined(__ia64__) +-#include "../../../arch/ia64/include/uapi/asm/errno.h" +-#elif defined(__xtensa__) +-#include "../../../arch/xtensa/include/uapi/asm/errno.h" ++#elif defined(__hppa__) ++#include "../../../arch/parisc/include/uapi/asm/errno.h" + #else + #include <asm-generic/errno.h> + #endif diff --git a/debian/patches/series b/debian/patches/series index 10a986718889..18b25d16a5a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -125,6 +125,7 @@ bugfix/all/cpupower-fix-checks-for-cpu-existence.patch bugfix/all/tools-perf-pmu-events-fix-reproducibility.patch bugfix/all/0005-libtraceevent-Add-dependency-on-libdl.patch bugfix/all/bpftool-fix-version-string-in-recursive-builds.patch +bugfix/all/tools-include-uapi-fix-errno.h.patch # overlay: allow mounting in user namespaces debian/overlayfs-permit-mounts-in-userns.patch |