diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-09-03 10:47:16 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-09-03 16:02:03 -0700 |
| commit | ab3072ee4cf555eb5eb8b6200fd0ffb3eab3f947 (patch) | |
| tree | 0ae7ca28764678d384e352c80f660b5c0691c91b /meta-initramfs | |
| parent | a0cc2d6353672a00e716e7246c4e9ece1e7fedc0 (diff) | |
| download | meta-openembedded-contrib-ab3072ee4cf555eb5eb8b6200fd0ffb3eab3f947.tar.gz | |
klibc: Fix build with 5.2+ kernel headers
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-initramfs')
| -rw-r--r-- | meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch | 36 | ||||
| -rw-r--r-- | meta-initramfs/recipes-devtools/klibc/klibc.inc | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch b/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch new file mode 100644 index 0000000000..4bedef8052 --- /dev/null +++ b/meta-initramfs/recipes-devtools/klibc/files/0001-Fix-missing-include-in-sys-mman.h.patch @@ -0,0 +1,36 @@ +From 36360b16833400de7818151be5588b16ac4fd5bc Mon Sep 17 00:00:00 2001 +From: Barret Rhoden <brho@google.com> +Date: Thu, 14 Mar 2019 17:30:38 -0400 +Subject: [PATCH] Fix missing include in sys/mman.h + +Linux commit 746c9398f5ac ("arch: move common mmap flags to +linux/mman.h") moved a few mmap flags, particularly MAP_PRIVATE, from +asm/mman.h to linux/mman.h. This broke klibc's build, which uses +MAP_PRIVATE. + +linux/mman.h includes asm/mman.h, so this commit merely includes +linux/mman.h instead of asm/mman.h. + +Signed-off-by: Barret Rhoden <brho@google.com> +Signed-off-by: Ben Hutchings <ben@decadent.org.uk> +--- +Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=d4853d030639cf3542ae39129c18b654d8d4f020] + usr/include/sys/mman.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr/include/sys/mman.h b/usr/include/sys/mman.h +index 56f0b65c..3fd626e7 100644 +--- a/usr/include/sys/mman.h ++++ b/usr/include/sys/mman.h +@@ -7,7 +7,7 @@ + + #include <klibc/extern.h> + #include <sys/types.h> +-#include <asm/mman.h> ++#include <linux/mman.h> + + #define MAP_FAILED ((void *)-1) + +-- +2.23.0 + diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index 86aae33407..26689f87e7 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -23,6 +23,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git \ file://0001-klibc-add-getrandom-syscall.patch \ file://0001-klibc-Kbuild-Accept-EXTRA_KLIBCAFLAGS.patch \ file://0001-Define-ulocked_-fgets-fread-fwrite-aliases.patch \ + file://0001-Fix-missing-include-in-sys-mman.h.patch \ " ARMPATCHES ?= "" |