From 328224198beecc4f94747613e5689e1ddcde047a Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 6 Sep 2017 17:24:09 +0200 Subject: [AGL] Remove weston conf from weston recipes Change-Id: I53d102b5753aa89a744ad58edd3ed88ba1c4c721 Signed-off-by: Ronan Le Martret --- .../recipes-graphics/wayland/weston/weston.ini | 2 -- .../recipes-graphics/wayland/weston_2.%.bbappend | 30 ---------------------- 2 files changed, 32 deletions(-) delete mode 100644 meta-rcar-gen3/recipes-graphics/wayland/weston/weston.ini 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.%.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston_2.%.bbappend index 133f397..34ea2c9 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston_2.%.bbappend +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston_2.%.bbappend @@ -1,31 +1 @@ require weston.inc - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://weston.ini \ -" - -do_install_append() { - install -d ${D}/${sysconfdir}/xdg/weston - # install weston.ini as sample settings of gl-renderer - install -m 644 ${WORKDIR}/weston.ini ${D}/${sysconfdir}/xdg/weston/ - - # 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 \ -" -- cgit 1.2.3-korg