From c436abca9832f1aa93f30c8d6ff36471d7bc4ca9 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 30 Aug 2019 12:06:30 -0400 Subject: linux-libc-headers: update to v5.2 headers We drop the patch 0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch since it was a backport and is already part of the 5.2 headers Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/conf/distro/include/tcmode-default.inc | 2 +- ...api-asm-ptrace.h-should-not-depend-on-uap.patch | 62 ---------------------- .../linux-libc-headers/linux-libc-headers_5.0.bb | 19 ------- .../linux-libc-headers/linux-libc-headers_5.2.bb | 18 +++++++ 4 files changed, 19 insertions(+), 82 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index c89b8e012d..5c28386c4f 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -23,7 +23,7 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.32%" GDBVERSION ?= "8.3%" GLIBCVERSION ?= "2.30%" -LINUXLIBCVERSION ?= "5.0%" +LINUXLIBCVERSION ?= "5.2%" QEMUVERSION ?= "4.1%" GOVERSION ?= "1.12%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch deleted file mode 100644 index 5ea46e9590..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 35341ca0614ab13e1ef34ad4f29a39e15ef31fa8 Mon Sep 17 00:00:00 2001 -From: Anisse Astier -Date: Mon, 17 Jun 2019 15:22:22 +0200 -Subject: [PATCH] arm64/sve: should not depend on - - -Pulling linux/prctl.h into asm/ptrace.h in the arm64 UAPI headers causes -userspace build issues for any program (e.g. strace and qemu) that -includes both and when using musl libc: - - | error: redefinition of 'struct prctl_mm_map' - | struct prctl_mm_map { - -See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 -for a public example of people working around this issue. - -Although it's a bit grotty, fix this breakage by duplicating the prctl -constant definitions. Since these are part of the kernel ABI, they -cannot be changed in future and so it's not the end of the world to have -them open-coded. - -Fixes: 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support") - -Upstream-Status: Backport [https://github.com/torvalds/linux/commit/35341ca0614ab13e1ef34ad4f29a39e15ef31fa8] -Cc: stable@vger.kernel.org -Acked-by: Dave Martin -Signed-off-by: Anisse Astier -Signed-off-by: Will Deacon ---- - arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h -index 97c53203150b..e932284993d4 100644 ---- a/arch/arm64/include/uapi/asm/ptrace.h -+++ b/arch/arm64/include/uapi/asm/ptrace.h -@@ -65,8 +65,6 @@ - - #ifndef __ASSEMBLY__ - --#include -- - /* - * User structures for general purpose, floating point and debug registers. - */ -@@ -113,10 +111,10 @@ struct user_sve_header { - - /* - * Common SVE_PT_* flags: -- * These must be kept in sync with prctl interface in -+ * These must be kept in sync with prctl interface in - */ --#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) --#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) -+#define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_VL_INHERIT */ >> 16) -+#define SVE_PT_VL_ONEXEC ((1 << 18) /* PR_SVE_SET_VL_ONEXEC */ >> 16) - - - /* --- -2.22.0 - diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb deleted file mode 100644 index 473688d95f..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require linux-libc-headers.inc - -SRC_URI_append_libc-musl = "\ - file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ - file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ - file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ - file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ - file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ - file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ - " - -SRC_URI_append = "\ - file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ - file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ - file://0001-arm64-sve-uapi-asm-ptrace.h-should-not-depend-on-uap.patch \ -" - -SRC_URI[md5sum] = "7381ce8aac80a01448e065ce795c19c0" -SRC_URI[sha256sum] = "437b141a6499159f5a7282d5eb4b2be055f8e862ccce44d7464e8759c31a2e43" diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb new file mode 100644 index 0000000000..9d18df76c6 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.2.bb @@ -0,0 +1,18 @@ +require linux-libc-headers.inc + +SRC_URI_append_libc-musl = "\ + file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ + file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ + file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ + file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ + file://0001-if_ether-move-muslc-ethhdr-protection-to-uapi-file.patch \ + file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ + " + +SRC_URI_append = "\ + file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ + file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ +" + +SRC_URI[md5sum] = "ddf994de00d7b18395886dd9b30b9262" +SRC_URI[sha256sum] = "54ad66f672e1a831b574f5e704e8a05f1e6180a8245d4bdd811208a6cb0ac1e7" -- cgit 1.2.3-korg