aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2017-09-06 17:24:09 +0200
committerRonan Le Martret <ronan.lemartret@iot.bzh>2019-06-20 11:12:39 +0200
commitfe2510aa9492c14efef833f04f8b9033e8c57076 (patch)
tree60cbcdfb32eae0b4b130c3483fb2caeca9e1ffb3
parentc1e3ab20977638e05afe3c35e73ad92552429b68 (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.ini2
-rw-r--r--meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend29
2 files changed, 0 insertions, 31 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 a261745..b3106c3 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,8 +13,6 @@ SRC_URI_append = " \
file://weston.png \
file://weston.desktop \
file://xwayland.weston-start \
- file://weston.ini \
- file://weston_v4l2.ini \
file://weston.sh \
"
@@ -26,38 +24,11 @@ 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}" = "m3nulcb" -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
-
# 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 = " \
- ${sysconfdir}/xdg/weston/weston.ini \
${sysconfdir}/profile.d/weston.sh \
"