diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2022-12-15 07:55:48 -0700 |
---|---|---|
committer | Tom Hochstein <tom.hochstein@nxp.com> | 2022-12-15 09:42:13 -0700 |
commit | f17b502396a29e62bef3d411120f2a6aea90d0a9 (patch) | |
tree | c2e24ca151a533bb1fba8a72dbb24dbf4f045484 | |
parent | 86f94d29da9f13dcde14e2a85f56435de420a867 (diff) | |
download | meta-freescale-f17b502396a29e62bef3d411120f2a6aea90d0a9.tar.gz |
weston-init: Drop redundant xwayland=true setting
The main recipe now sets xwayland=true in weston.ini, so drop it from
here.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
3 files changed, 0 insertions, 5 deletions
diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini index 707a4078..b1392871 100644 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini | |||
@@ -4,7 +4,6 @@ modules=hmi-controller.so | |||
4 | #gbm-format=argb8888 | 4 | #gbm-format=argb8888 |
5 | idle-time=0 | 5 | idle-time=0 |
6 | #use-g2d=1 | 6 | #use-g2d=1 |
7 | #xwayland=true | ||
8 | #repaint-window=16 | 7 | #repaint-window=16 |
9 | #enable-overlay-view=1 | 8 | #enable-overlay-view=1 |
10 | 9 | ||
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index 4ba6cba7..ffc26456 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend | |||
@@ -12,9 +12,6 @@ SRC_URI:append:mx6sl-nxp-bsp = " file://weston.config" | |||
12 | # commented out. For example: | 12 | # commented out. For example: |
13 | # #xwayland=true | 13 | # #xwayland=true |
14 | # Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS. | 14 | # Then add the assignment to INI_UNCOMMENT_ASSIGNMENTS. |
15 | INI_UNCOMMENT_ASSIGNMENTS:append:imx-nxp-bsp = " \ | ||
16 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \ | ||
17 | " | ||
18 | INI_UNCOMMENT_ASSIGNMENTS:append:mx8-nxp-bsp = " \ | 15 | INI_UNCOMMENT_ASSIGNMENTS:append:mx8-nxp-bsp = " \ |
19 | repaint-window=16 \ | 16 | repaint-window=16 \ |
20 | " | 17 | " |
diff --git a/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini index 3e8be42f..3e298973 100644 --- a/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini +++ b/recipes-graphics/wayland/weston-init/imx-nxp-bsp/weston.ini | |||
@@ -2,7 +2,6 @@ | |||
2 | #gbm-format=argb8888 | 2 | #gbm-format=argb8888 |
3 | idle-time=0 | 3 | idle-time=0 |
4 | #use-g2d=1 | 4 | #use-g2d=1 |
5 | #xwayland=true | ||
6 | #repaint-window=16 | 5 | #repaint-window=16 |
7 | #enable-overlay-view=1 | 6 | #enable-overlay-view=1 |
8 | modules=screen-share.so | 7 | modules=screen-share.so |