summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2017-03-24 11:16:21 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-03-30 07:36:39 +0000
commit7d1d7457ff2b71abe95525b26148d5a3e7a42790 (patch)
treec7b9796ea099f94da5b879276235fea6077d6bf4 /meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland
parent64d59ff0e0e835a53445b07257d3896fb48abfb5 (diff)
Generate weston.ini dynamically
* remove weston-intel.ini * add new package weston-ini-conf * the list of the sections of weston.ini is described in variable flags WESTONSECTION * each section is described in variable flags WESTONSECTION * each output screen is described in agl_screen variable Bug-AGL: SPEC-477 Change-Id: I3d25ab49018e3842c916993ba8b9bcc2428d5170 Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland')
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend1
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston/weston-rcar.ini11
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend16
3 files changed, 1 insertions, 27 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend
new file mode 100644
index 000000000..de8d9552c
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -0,0 +1 @@
+WESTONCORE[repaint-window] ??= "34"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston/weston-rcar.ini b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston/weston-rcar.ini
deleted file mode 100644
index a37895c9c..000000000
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston/weston-rcar.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[core]
-shell=ivi-shell.so
-backend=drm-backend.so
-repaint-window=34
-
-[ivi-shell]
-ivi-module=ivi-controller.so
-
-[output]
-name=HDMI-A-1
-transform=90
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend
index 98b973caa..079ff496a 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend
@@ -1,15 +1,3 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-
-SRC_URI_append = "\
- file://weston-rcar.ini \
- "
-
-do_install_append() {
- WESTON_INI_CONFIG=${sysconfdir}/xdg/weston
- install -d ${D}${WESTON_INI_CONFIG}
- install -m 0644 ${WORKDIR}/weston-rcar.ini ${D}${WESTON_INI_CONFIG}/weston.ini
-}
-
FILES_${PN}_append_rcar-gen3 = " \
${libexecdir}/weston-screenshooter \
${libexecdir}/weston-ivi-shell-user-interface \
@@ -17,7 +5,3 @@ FILES_${PN}_append_rcar-gen3 = " \
${libexecdir}/weston-simple-im \
${libexecdir}/weston-desktop-shell \
"
-
-FILES_${PN}_append = " \
- ${sysconfdir}/xdg/weston/weston.ini \
- "