diff options
| author |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-09-06 17:24:09 +0200 |
|---|---|---|
| committer | Ronan Le Martret <ronan.lemartret@iot.bzh> | 2018-05-16 09:34:37 +0200 |
| commit | 863a7a4a894dbf91e09ec2aef7b94202470c67a7 (patch) | |
| tree | 0992d491788fe136843472f5a30e43f307a12f56 | |
| parent | 0444ff43aefe35712f63f673c249f9a5b245e26c (diff) | |
[AGL] Remove weston conf from weston recipes
Change-Id: I53d102b5753aa89a744ad58edd3ed88ba1c4c721
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
| -rw-r--r-- | meta-rcar-gen3/recipes-graphics/wayland/weston/weston.ini | 2 | ||||
| -rw-r--r-- | meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend | 33 |
2 files changed, 1 insertions, 34 deletions
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston/weston.ini b/meta-rcar-gen3/recipes-graphics/wayland/weston/weston.ini deleted file mode 100644 index f31c290..0000000 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston/weston.ini +++ /dev/null @@ -1,2 +0,0 @@ -[core] -repaint-window=34 diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend index 86518df..02a3291 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend @@ -13,7 +13,6 @@ SRC_URI_append = " \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ - file://weston.ini \ file://weston_v4l2.ini \ " @@ -24,34 +23,4 @@ PACKAGECONFIG_append = " \ " PACKAGECONFIG[v4l2] = " --enable-v4l2, --disable-v4l2,,kernel-module-vsp2driver" -do_install_append() { - install -d ${D}/${sysconfdir}/xdg/weston - if [ "X${USE_MULTIMEDIA}" = "X1" ]; then - # install weston.ini as sample settings of v4l2-renderer - if [ "${MACHINE}" = "m3ulcb" -o "${MACHINE}" = "h3ulcb" ] ; then - sed -i 's|media1|media0|g' ${WORKDIR}/weston_v4l2.ini - fi - install -m 644 ${WORKDIR}/weston_v4l2.ini ${D}/${sysconfdir}/xdg/weston/weston.ini - else - # install weston.ini as sample settings of gl-renderer - install -m 644 ${WORKDIR}/weston.ini ${D}/${sysconfdir}/xdg/weston/ - fi - - # Checking for ivi-shell configuration - # If ivi-shell is enable, we will add its configs to weston.ini - if [ "X${USE_WAYLAND_IVI_SHELL}" = "X1" ]; then - sed -i '/repaint-window=34/c\repaint-window=34\nshell=ivi-shell.so' \ - ${D}/${sysconfdir}/xdg/weston/weston.ini - sed -e '$a\\' \ - -e '$a\[ivi-shell]' \ - -e '$a\ivi-module=ivi-controller.so' \ - -e '$a\ivi-input-module=ivi-input-controller.so' \ - -e '$a\transition-duration=300' \ - -e '$a\cursor-theme=default' \ - -i ${D}/${sysconfdir}/xdg/weston/weston.ini - fi -} - -FILES_${PN}_append = " \ - ${sysconfdir}/xdg/weston/weston.ini \ -" + |