summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2016-05-18 13:40:36 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-21 22:24:55 +0100
commite2f31e150e0869f103e29e562743b3ba39182d3e (patch)
tree652a32e772a7ba5d72207e060c761e57736af524 /meta/recipes-graphics/wayland
parent2192a48a5dc2f2e9c16d6b03ddd578333763c355 (diff)
downloadpoky-e2f31e150e0869f103e29e562743b3ba39182d3e.tar.gz
weston: weston-launch: Handle invalid command line options
Exit the program if an unrecognized command line option is found. (From OE-Core rev: 9494ac03152174eee811e0534cf56e2248c58cc6) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r--meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch33
-rw-r--r--meta/recipes-graphics/wayland/weston_1.10.0.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch b/meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch
new file mode 100644
index 0000000000..25c868311c
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch
@@ -0,0 +1,33 @@
1From e8b615250f700f7854b423aaaf0a0aeea92c05a9 Mon Sep 17 00:00:00 2001
2From: Tom Hochstein <tom.hochstein@nxp.com>
3Date: Sat, 7 May 2016 08:51:58 -0300
4Subject: [PATCH] weston-launch: Handle invalid command line options
5Organization: O.S. Systems Software LTDA.
6
7Exit the program if an unrecognized command line option is found.
8
9Upstream-Status: Submitted
10
11Signed-off-by; Tom Hochstein <tom.hochstein@nxp.com>
12Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
13---
14
15 src/weston-launch.c | 2 ++
16 1 file changed, 2 insertions(+)
17
18diff --git a/src/weston-launch.c b/src/weston-launch.c
19index b8dfb17..9987d8e 100644
20--- a/src/weston-launch.c
21+++ b/src/weston-launch.c
22@@ -703,6 +703,8 @@ main(int argc, char *argv[])
23 case 'h':
24 help("weston-launch");
25 exit(EXIT_FAILURE);
26+ default:
27+ exit(EXIT_FAILURE);
28 }
29 }
30
31--
322.8.2
33
diff --git a/meta/recipes-graphics/wayland/weston_1.10.0.bb b/meta/recipes-graphics/wayland/weston_1.10.0.bb
index d8c9f9f696..d3e2607110 100644
--- a/meta/recipes-graphics/wayland/weston_1.10.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.10.0.bb
@@ -11,6 +11,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
11 file://make-libwebp-explicitly-configurable.patch \ 11 file://make-libwebp-explicitly-configurable.patch \
12 file://0001-make-error-portable.patch \ 12 file://0001-make-error-portable.patch \
13 file://0001-configure.ac-Fix-wayland-protocols-path.patch \ 13 file://0001-configure.ac-Fix-wayland-protocols-path.patch \
14 file://make-weston-launch-exit-for-unrecognized-option.patch \
14" 15"
15SRC_URI[md5sum] = "1cd17c54ecac6d9a3cd90bf12eaa3e20" 16SRC_URI[md5sum] = "1cd17c54ecac6d9a3cd90bf12eaa3e20"
16SRC_URI[sha256sum] = "e0b2004d00d8293ddf7903ca283c1746afa9ccb5919ab50fd04397ff472aa5c1" 17SRC_URI[sha256sum] = "e0b2004d00d8293ddf7903ca283c1746afa9ccb5919ab50fd04397ff472aa5c1"