From 26931e33d4aba1bb90e3abce5fdb043b7d989ab7 Mon Sep 17 00:00:00 2001 From: Duy Dang Date: Fri, 20 Sep 2019 11:12:28 +0700 Subject: rcar-gen3: weston: Remove weston-conf recipe Since upstream removes weston-conf recipe and move its content to weston-init instead, this also does the same for Renesas specific configurations. This commit also disables intel config of simple-dmabuf-drm option when running meson config of Weston 7.0 to avoid build error. Signed-off-by: Duy Dang Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda Change-Id: Ifba1b3f99cbf1e9cfff5557bf52a9424ad3e2bf7 --- .../recipes-graphics/wayland/weston-conf.bbappend | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 meta-rcar-gen3/recipes-graphics/wayland/weston-conf.bbappend (limited to 'meta-rcar-gen3/recipes-graphics/wayland/weston-conf.bbappend') diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-conf.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston-conf.bbappend deleted file mode 100644 index b76ff81..0000000 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston-conf.bbappend +++ /dev/null @@ -1,34 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_rcar-gen3 = " \ - file://weston.ini \ - file://weston.sh \ -" - -do_install_append_rcar-gen3() { - 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 - - # Set XDG_RUNTIME_DIR to /run/user/$UID (e.g. run/user/0) - install -d ${D}/${sysconfdir}/profile.d - install -m 0755 ${WORKDIR}/weston.sh ${D}/${sysconfdir}/profile.d/weston.sh -} - -FILES_${PN}_append_rcar-gen3 = " \ - ${sysconfdir}/profile.d/weston.sh \ -" -- cgit 1.2.3-korg