From 7d1d7457ff2b71abe95525b26148d5a3e7a42790 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 24 Mar 2017 11:16:21 +0100 Subject: 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 --- .../packagegroup-ivi-common-core-graphics.bb | 2 +- .../wayland/weston-ivi-shell-config.bb | 14 --- .../wayland/weston-ivi-shell/weston.ini.ivi-shell | 99 ---------------------- 3 files changed, 1 insertion(+), 114 deletions(-) delete mode 100644 meta-ivi-common/recipes-graphics/wayland/weston-ivi-shell-config.bb delete mode 100644 meta-ivi-common/recipes-graphics/wayland/weston-ivi-shell/weston.ini.ivi-shell (limited to 'meta-ivi-common') diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-graphics.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-graphics.bb index 01a7e0dc3..5021caa3a 100644 --- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-graphics.bb +++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-graphics.bb @@ -12,6 +12,6 @@ PACKAGES = "\ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ - weston weston-examples \ + weston weston-ini-conf weston-examples \ wayland-ivi-extension \ " diff --git a/meta-ivi-common/recipes-graphics/wayland/weston-ivi-shell-config.bb b/meta-ivi-common/recipes-graphics/wayland/weston-ivi-shell-config.bb deleted file mode 100644 index 08921ef8e..000000000 --- a/meta-ivi-common/recipes-graphics/wayland/weston-ivi-shell-config.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Configuration file for Weston IVI-Shell" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" - -FILESEXTRAPATHS_prepend := ":${THISDIR}/weston-ivi-shell:" - -SRC_URI = "file://weston.ini.ivi-shell" - -do_install() { - install -d ${D}${sysconfdir}/xdg/weston - install -m644 ${WORKDIR}/weston.ini.ivi-shell ${D}${sysconfdir}/xdg/weston/weston.ini -} - -RDEPENDS_${PN} = "weston" diff --git a/meta-ivi-common/recipes-graphics/wayland/weston-ivi-shell/weston.ini.ivi-shell b/meta-ivi-common/recipes-graphics/wayland/weston-ivi-shell/weston.ini.ivi-shell deleted file mode 100644 index 982ab8789..000000000 --- a/meta-ivi-common/recipes-graphics/wayland/weston-ivi-shell/weston.ini.ivi-shell +++ /dev/null @@ -1,99 +0,0 @@ -[core] -shell=ivi-shell.so - -[ivi-shell] -ivi-module=hmi-controller.so -#ivi-module=hmi-controller.so,ivi-controller.so -ivi-shell-user-interface=/usr/lib/weston/weston-ivi-shell-user-interface - -#developermode=true - -cursor-theme=default -cursor-size=32 - -base-layer-id=1000 -workspace-background-layer-id=2000 -workspace-layer-id=3000 -application-layer-id=4000 - -transition-duration=300 - -background-icon=/usr/share/weston/background.png -background-id=1001 -panel-icon=/usr/share/weston/panel.png -panel-id=1002 -tiling-icon=/usr/share/weston/tiling.png -tiling-id=1003 -sidebyside-icon=/usr/share/weston/sidebyside.png -sidebyside-id=1004 -fullscreen-icon=/usr/share/weston/fullscreen.png -fullscreen-id=1005 -random-icon=/usr/share/weston/random.png -random-id=1006 -home-icon=/usr/share/weston/home.png -home-id=1007 -workspace-background-color=0x99000000 -workspace-background-id=2001 - -[input-method] -path=/usr/lib/weston/weston-keyboard - -[ivi-launcher] -workspace-id=0 -icon-id=4001 -icon=/usr/share/weston/icon_ivi_flower.png -path=/usr/bin/weston-flower - -[ivi-launcher] -workspace-id=0 -icon-id=4002 -icon=/usr/share/weston/icon_ivi_clickdot.png -path=/usr/bin/weston-clickdot - -[ivi-launcher] -workspace-id=1 -icon-id=4003 -icon=/usr/share/weston/icon_ivi_simple-egl.png -path=/usr/bin/weston-simple-egl - -[ivi-launcher] -workspace-id=1 -icon-id=4004 -icon=/usr/share/weston/icon_ivi_simple-shm.png -path=/usr/bin/weston-simple-shm - -[ivi-launcher] -workspace-id=2 -icon-id=4005 -icon=/usr/share/weston/icon_ivi_smoke.png -path=/usr/bin/weston-smoke - -[ivi-launcher] -workspace-id=3 -icon-id=4006 -icon=/usr/share/weston/icon_ivi_flower.png -path=/usr/bin/weston-flower - -[ivi-launcher] -workspace-id=3 -icon-id=4007 -icon=/usr/share/weston/icon_ivi_clickdot.png -path=/usr/bin/weston-clickdot - -[ivi-launcher] -workspace-id=3 -icon-id=4008 -icon=/usr/share/weston/icon_ivi_simple-egl.png -path=/usr/bin/weston-simple-egl - -[ivi-launcher] -workspace-id=3 -icon-id=4009 -icon=/usr/share/weston/icon_ivi_simple-shm.png -path=/usr/bin/weston-simple-shm - -[ivi-launcher] -workspace-id=3 -icon-id=4010 -icon=/usr/share/weston/icon_ivi_smoke.png -path=/usr/bin/weston-smoke -- cgit 1.2.3-korg