diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2019-11-17 09:25:11 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2019-11-18 10:16:54 -0300 |
commit | 66989b7d07f8a1cdd4050fe3e3b088b6ead80786 (patch) | |
tree | 1c3128a787b5fc796d687063fa8daea525685550 /dynamic-layers/ivi/recipes-graphics/wayland | |
parent | 152747a8fdf15ce0ea8bbe944d05139875c8223d (diff) | |
download | meta-freescale-66989b7d07f8a1cdd4050fe3e3b088b6ead80786.tar.gz |
weston-init: Move weston.ini install to weston-init
OE-core now installs weston.ini from weston-init, so align our
recipe to do the same.
The IVI dynamic layer now has a copy of the weston.ini file
that is normally produced by the weston build.
The AGL dynamic layer now uninstalls the weston.ini installed
upstream.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'dynamic-layers/ivi/recipes-graphics/wayland')
3 files changed, 105 insertions, 2 deletions
diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend new file mode 100644 index 00000000..72d991c7 --- /dev/null +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend | |||
@@ -0,0 +1 @@ | |||
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | |||
diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini new file mode 100644 index 00000000..6e8e0140 --- /dev/null +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini | |||
@@ -0,0 +1,104 @@ | |||
1 | [core] | ||
2 | shell=ivi-shell.so | ||
3 | modules=hmi-controller.so | ||
4 | #gbm-format=argb8888 | ||
5 | #use-g2d=1 | ||
6 | #xwayland=true | ||
7 | |||
8 | #[shell] | ||
9 | #size=1920x1080 | ||
10 | |||
11 | [ivi-shell] | ||
12 | ivi-shell-user-interface=weston-ivi-shell-user-interface | ||
13 | |||
14 | #developermode=true | ||
15 | |||
16 | cursor-theme=default | ||
17 | cursor-size=32 | ||
18 | |||
19 | base-layer-id=1000 | ||
20 | base-layer-id-offset=10000 | ||
21 | |||
22 | workspace-background-layer-id=2000 | ||
23 | workspace-layer-id=3000 | ||
24 | application-layer-id=4000 | ||
25 | |||
26 | transition-duration=300 | ||
27 | |||
28 | background-image=/usr/share/weston/background.png | ||
29 | background-id=1001 | ||
30 | panel-image=/usr/share/weston/panel.png | ||
31 | panel-id=1002 | ||
32 | surface-id-offset=10 | ||
33 | tiling-image=/usr/share/weston/tiling.png | ||
34 | tiling-id=1003 | ||
35 | sidebyside-image=/usr/share/weston/sidebyside.png | ||
36 | sidebyside-id=1004 | ||
37 | fullscreen-image=/usr/share/weston/fullscreen.png | ||
38 | fullscreen-id=1005 | ||
39 | random-image=/usr/share/weston/random.png | ||
40 | random-id=1006 | ||
41 | home-image=/usr/share/weston/home.png | ||
42 | home-id=1007 | ||
43 | workspace-background-color=0x99000000 | ||
44 | workspace-background-id=2001 | ||
45 | |||
46 | [ivi-launcher] | ||
47 | workspace-id=0 | ||
48 | icon-id=4001 | ||
49 | icon=/usr/share/weston/icon_ivi_flower.png | ||
50 | path=/usr/bin/weston-flower | ||
51 | |||
52 | [ivi-launcher] | ||
53 | workspace-id=0 | ||
54 | icon-id=4002 | ||
55 | icon=/usr/share/weston/icon_ivi_clickdot.png | ||
56 | path=/usr/bin/weston-clickdot | ||
57 | |||
58 | [ivi-launcher] | ||
59 | workspace-id=1 | ||
60 | icon-id=4003 | ||
61 | icon=/usr/share/weston/icon_ivi_simple-egl.png | ||
62 | path=/usr/bin/weston-simple-egl | ||
63 | |||
64 | [ivi-launcher] | ||
65 | workspace-id=1 | ||
66 | icon-id=4004 | ||
67 | icon=/usr/share/weston/icon_ivi_simple-shm.png | ||
68 | path=/usr/bin/weston-simple-shm | ||
69 | |||
70 | [ivi-launcher] | ||
71 | workspace-id=2 | ||
72 | icon-id=4005 | ||
73 | icon=/usr/share/weston/icon_ivi_smoke.png | ||
74 | path=/usr/bin/weston-smoke | ||
75 | |||
76 | [ivi-launcher] | ||
77 | workspace-id=3 | ||
78 | icon-id=4006 | ||
79 | icon=/usr/share/weston/icon_ivi_flower.png | ||
80 | path=/usr/bin/weston-flower | ||
81 | |||
82 | [ivi-launcher] | ||
83 | workspace-id=3 | ||
84 | icon-id=4007 | ||
85 | icon=/usr/share/weston/icon_ivi_clickdot.png | ||
86 | path=/usr/bin/weston-clickdot | ||
87 | |||
88 | [ivi-launcher] | ||
89 | workspace-id=3 | ||
90 | icon-id=4008 | ||
91 | icon=/usr/share/weston/icon_ivi_simple-egl.png | ||
92 | path=/usr/bin/weston-simple-egl | ||
93 | |||
94 | [ivi-launcher] | ||
95 | workspace-id=3 | ||
96 | icon-id=4009 | ||
97 | icon=/usr/share/weston/icon_ivi_simple-shm.png | ||
98 | path=/usr/bin/weston-simple-shm | ||
99 | |||
100 | [ivi-launcher] | ||
101 | workspace-id=3 | ||
102 | icon-id=4010 | ||
103 | icon=/usr/share/weston/icon_ivi_smoke.png | ||
104 | path=/usr/bin/weston-smoke | ||
diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston_5.0.0.imx.bbappend b/dynamic-layers/ivi/recipes-graphics/wayland/weston_5.0.0.imx.bbappend deleted file mode 100644 index d36fbd4d..00000000 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston_5.0.0.imx.bbappend +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | # install default weston.ini for IVI | ||
2 | WESTON_INI_INSTALL_FILE = "${B}/ivi-shell/weston.ini" | ||