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/use-XDG_RUNTIMESHARE_DIR.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/use-XDG_RUNTIMESHARE_DIR.patch')
| -rw-r--r-- | meta-agl-profile-graphical/recipes-graphics/wayland/weston/use-XDG_RUNTIMESHARE_DIR.patch | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/use-XDG_RUNTIMESHARE_DIR.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/use-XDG_RUNTIMESHARE_DIR.patch index 2f3b0108a..0e5d7cdf9 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/weston/use-XDG_RUNTIMESHARE_DIR.patch +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/weston/use-XDG_RUNTIMESHARE_DIR.patch @@ -29,19 +29,21 @@ remain maintained locally out of mainstream in the wait of further investigations. Signed-off-by: José Bollo <jose.bollo@iot.bzh> +[Updated for Weston 8.0.0] +Signed-off-by: Scott Murray <scott.murray@konsulko.com> diff --git a/shared/os-compatibility.c b/shared/os-compatibility.c -index e19fb61b..826e48b8 100644 +index 5e1ce47..9962588 100644 --- a/shared/os-compatibility.c +++ b/shared/os-compatibility.c -@@ -157,7 +157,9 @@ os_create_anonymous_file(off_t size) - int fd; - int ret; - -- path = getenv("XDG_RUNTIME_DIR"); -+ path = getenv("XDG_RUNTIMESHARE_DIR"); -+ if (!path) -+ path = getenv("XDG_RUNTIME_DIR"); - if (!path) { - errno = ENOENT; - return -1; +@@ -184,7 +184,9 @@ os_create_anonymous_file(off_t size) + } else + #endif + { +- path = getenv("XDG_RUNTIME_DIR"); ++ path = getenv("XDG_RUNTIMESHARE_DIR"); ++ if (!path) ++ path = getenv("XDG_RUNTIME_DIR"); + if (!path) { + errno = ENOENT; + return -1; |