diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-04-27 17:32:16 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-04-27 17:32:33 +0200 |
| commit | b16f1f6b8bdd7b0cef4aad3a6714798b66d8b0a5 (patch) | |
| tree | 61c5df69bed7810e988b06434e8efc7ab9071acd /meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-unconditionally-include-mman.h.patch | |
| parent | 40213738bcd84fc542cda3ec6336b0e394b28dcc (diff) | |
| parent | c24cdffea9dfa3904fc3ea9da0bc80e5515b078d (diff) | |
Merge branch 'next'
* next:
Temporary workarounds for h3ulcb and bbe
[RCAR] use omx-user-module as libomxil provider
meta-agl-bsp: dra7xx-evm/beaglebone updates for dunfell
meta-agl-bsp: remove obsolete linux-fslc-imx bbappend
meta-agl-profile-graphical-qt5: remove Chromium specific bits from SDK
meta-agl-profile-graphical: disable memfd usage in weston
meta-agl-bsp: update raspberrypi configuration for dunfell
meta-agl-{bsp,distro}: update kernel configuration for dunfell
meta-agl-profile-core: update psplash for dunfell
meta-agl-profile-core: update systemd for dunfell
meta-app-framework: set DISTRO_FEATURES_NATIVE
meta-agl-profile-core: update bluez5 for dunfell
meta-agl-profile-graphical: update weston for dunfell
meta-agl-profile-graphical: update wayland-ivi-extension for dunfell
meta-agl-profile-graphical: update wayland for dunfell
meta-agl-profile-core: update pulseaudio for dunfell
meta-security: update to audit 2.8.5
Update distro_features_check usage
meta-agl-bsp: remove vboxguestdrivers recipe
Declare layer compatibility for dunfell
Change-Id: I879ad3040ed6f2fca3f21d189ccce7f1614013b5
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-unconditionally-include-mman.h.patch')
| -rw-r--r-- | meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-unconditionally-include-mman.h.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-unconditionally-include-mman.h.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-unconditionally-include-mman.h.patch new file mode 100644 index 000000000..278087156 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0004-unconditionally-include-mman.h.patch @@ -0,0 +1,33 @@ +commit 7b36f171d09354a2d3a48db0ae2d34d66aa4f1ae +Author: James Hilliard <james.hilliard1@gmail.com> +Date: Sat Feb 1 20:02:29 2020 -0700 + + unconditionally include sys/mman.h in os-compatibility.c + + Fixes: + ../shared/os-compatibility.c:273:25: error: ‘PROT_READ’ undeclared (first use in this function); did you mean ‘LOCK_READ’? + map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, file->fd, 0); + ^~~~~~~~~ + LOCK_READ + + Signed-off-by: James Hilliard <james.hilliard1@gmail.com> + +Upstream-Status: Backport + +Signed-off-by: Scott Murray <scott.murray@konsulko.com> + +diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c +index 5e1ce479..041c929f 100644 +--- a/shared/os-compatibility.c ++++ b/shared/os-compatibility.c +@@ -34,10 +34,7 @@ + #include <string.h> + #include <stdlib.h> + #include <libweston/zalloc.h> +- +-#ifdef HAVE_MEMFD_CREATE + #include <sys/mman.h> +-#endif + + #include "os-compatibility.h" + |