diff options
author | Ross Burton <ross.burton@intel.com> | 2013-11-07 11:55:34 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 17:31:35 +0000 |
commit | f6484887ba2a2bb3133276afc04c027d081e8f92 (patch) | |
tree | f3ff524c1f2f6aecd3cb26a968b35290fcc7f8b9 /meta/recipes-graphics/wayland/weston/weston-launch-shell.patch | |
parent | 5177812b27aadeff654580455c957e181aeb0cae (diff) | |
download | poky-f6484887ba2a2bb3133276afc04c027d081e8f92.tar.gz |
weston: upgrade to 1.3.0
Remove backported patches that are now integrated.
No need to patch build to install examples with --enable-demo-clients, update
FILES now that all examples are being installed.
Remove cairo-gl option as our cairo doesn't support GL (yet), remove
--disable-android-compositor as it was dropped upstream, and add PACKAGECONFIG
for the VAAPI-based recorder as otherwise it's a floating dependency (libva is
in meta-intel).
Based on work by Ewan Le Bideau-Canevet <Ewan.LEBIDEAU-CANEVET@eurogiciel.fr>.
(From OE-Core rev: 7508b61d1cb869233f3d841183edd6fd19d5102e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland/weston/weston-launch-shell.patch')
-rw-r--r-- | meta/recipes-graphics/wayland/weston/weston-launch-shell.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/meta/recipes-graphics/wayland/weston/weston-launch-shell.patch b/meta/recipes-graphics/wayland/weston/weston-launch-shell.patch deleted file mode 100644 index ffe0608ee2..0000000000 --- a/meta/recipes-graphics/wayland/weston/weston-launch-shell.patch +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From ff3230952a68077669e0ea0ac3ceb234273556fc Mon Sep 17 00:00:00 2001 | ||
5 | From: Quentin Glidic <sardemff7+git@sardemff7.net> | ||
6 | Date: Fri, 17 May 2013 16:20:37 +0200 | ||
7 | Subject: [PATCH] weston-launch: Run weston in the user login shell | ||
8 | |||
9 | This patch brings back the user environment from the shell. | ||
10 | In the future, weston-launch could create the Wayland socket earlier, in | ||
11 | which case the user's shell could be used to run Wayland-specific tools | ||
12 | in the new Weston session. | ||
13 | |||
14 | Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> | ||
15 | --- | ||
16 | src/weston-launch.c | 19 ++++++++++++++++--- | ||
17 | 1 file changed, 16 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/src/weston-launch.c b/src/weston-launch.c | ||
20 | index 64d4a8a..89c3c5a 100644 | ||
21 | --- a/src/weston-launch.c | ||
22 | +++ b/src/weston-launch.c | ||
23 | @@ -60,6 +60,8 @@ | ||
24 | |||
25 | #include "weston-launch.h" | ||
26 | |||
27 | +#define MAX_ARGV_SIZE 256 | ||
28 | + | ||
29 | struct weston_launch { | ||
30 | struct pam_conv pc; | ||
31 | pam_handle_t *ph; | ||
32 | @@ -523,8 +525,9 @@ main(int argc, char *argv[]) | ||
33 | struct weston_launch wl; | ||
34 | char **env; | ||
35 | int i, c; | ||
36 | - char **child_argv; | ||
37 | + char *child_argv[MAX_ARGV_SIZE]; | ||
38 | char *tty = NULL, *new_user = NULL; | ||
39 | + char *term; | ||
40 | int sleep_fork = 0; | ||
41 | struct option opts[] = { | ||
42 | { "user", required_argument, NULL, 'u' }, | ||
43 | @@ -562,8 +565,8 @@ main(int argc, char *argv[]) | ||
44 | } | ||
45 | } | ||
46 | |||
47 | - child_argv = &argv[optind-1]; | ||
48 | - child_argv[0] = BINDIR "/weston"; | ||
49 | + if ((argc - optind) > (MAX_ARGV_SIZE - 5)) | ||
50 | + error(1, E2BIG, "Too many arguments to pass to weston"); | ||
51 | |||
52 | if (new_user) | ||
53 | wl.pw = getpwnam(new_user); | ||
54 | @@ -572,7 +575,17 @@ main(int argc, char *argv[]) | ||
55 | if (wl.pw == NULL) | ||
56 | error(1, errno, "failed to get username"); | ||
57 | |||
58 | + child_argv[0] = wl.pw->pw_shell; | ||
59 | + child_argv[1] = "-l"; | ||
60 | + child_argv[2] = "-c"; | ||
61 | + child_argv[3] = BINDIR "/weston \"$@\""; | ||
62 | + child_argv[4] = "weston"; | ||
63 | + for (i = 0; i < (argc - optind); ++i) | ||
64 | + child_argv[5+i] = argv[optind+i]; | ||
65 | + | ||
66 | + term = getenv("TERM"); | ||
67 | clearenv(); | ||
68 | + setenv("TERM", term, 1); | ||
69 | setenv("USER", wl.pw->pw_name, 1); | ||
70 | setenv("LOGNAME", wl.pw->pw_name, 1); | ||
71 | setenv("HOME", wl.pw->pw_dir, 1); | ||
72 | -- | ||
73 | 1.7.10.4 | ||
74 | |||