weston: configure and start entirely via tlm

Neither the OE weston-init nor "Tizen on Yocto"'s weston-ivi are
needed anymore. Instead tlm provides everything that is needed.

diff --git a/meta-tizen-ivi/conf/distro/tizen-ivi.conf b/meta-tizen-ivi/conf/distro/tizen-ivi.conf
index 1aeec4b..82d330b 100644 (file)
--- a/meta-tizen-ivi/conf/distro/tizen-ivi.conf
+++ b/meta-tizen-ivi/conf/distro/tizen-ivi.conf
@@ -2,7 +2,7 @@ require conf/distro/tizen.conf
 DISTRO = "tizen-ivi"
 
 # Use weston from Tizen since it contains Tizen specific patches
-WESTONSTARTUP = "weston-ivi"
+WESTONSTARTUP = ""
 IMAGECONFIG = "config-tizen-ivi"
 TLMCONFIG = "tlm-config-ivi-singleseat"
 

diff --git a/meta-tizen-ivi/recipes-graphics/weston-ivi/weston-ivi-extraconf.inc b/meta-tizen-ivi/recipes-graphics/weston-ivi/weston-ivi-extraconf.inc
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/meta-tizen-ivi/recipes-graphics/weston-ivi/weston-ivi.inc b/meta-tizen-ivi/recipes-graphics/weston-ivi/weston-ivi.inc
deleted file mode 100644 (file)
index 4a20038..0000000
--- a/meta-tizen-ivi/recipes-graphics/weston-ivi/weston-ivi.inc
+++ /dev/null
@@ -1,119 +0,0 @@
-DESCRIPTION = "Tizen IVI Weston configuration and set-up"
-HOMEPAGE = "http://nohomepage.org"
-SECTION = "Automotive/Configuration"
-LICENSE = "MIT"
-PV = "1"
-
-SRC_URI = ""
-
-S = "${WORKDIR}/git"
-
-inherit manifest autotools-brokensep
-
-BBCLASSEXTEND = ""
-PROVIDES = ""
-
-#PROVIDES by weston-ivi-config-modello
-PROVIDES += "weston-ivi-config-modello"
-
-
-#PROVIDES by weston-ivi-config
-PROVIDES += "weston-ivi-config"
-
-
-#PROVIDES by weston-ivi
-# the PROVIDES rules is ignore "weston-startup  "
-PROVIDES += "weston-startup"
-RPROVIDES_weston-ivi += "weston-startup"
-
-
-RDEPENDS = ""
-#RDEPENDS of weston-ivi-config-modello (${PN}-config-modello)
-RDEPENDS_${PN}-config-modello += "tlm-config-ivi-singleseat"
-RDEPENDS_${PN}-config-modello += "weekeyboard"
-RDEPENDS_${PN}-config-modello += "sed"
-
-#RDEPENDS of weston-ivi-config (${PN}-config)
-RDEPENDS_${PN}-config += "weekeyboard"
-
-
-DEPENDS = ""
-
-do_prep() {
- cd ${S}
- chmod -Rf a+rX,u+w,g-w,o-w ${S}
- #setup -q
- cp ${S}/packaging/weston-ivi.manifest .
- 
- 
-}
-do_patch_append() {
-    bb.build.exec_func('do_prep', d)
-}
-
-do_configure() {
-}
-
-do_compile() {
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- LD_AS_NEEDED=1; export LD_AS_NEEDED ;
- 
- 
- 
- 
-}
-
-do_install() {
- export RPM_BUILD_ROOT=${D}
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- rm -rf ${D}
- mkdir -p ${D}
- 
- 
- mkdir -p ${D}${sysconfdir}/profile.d/
- install -m 0644 weston.sh ${D}${sysconfdir}/profile.d/
- 
- mkdir -p ${D}${sysconfdir}/xdg/weston
- install -m 0644 weston.ini ${D}${sysconfdir}/xdg/weston
- 
- 
-}
-
-PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
-PACKAGES += " weston-ivi-config-modello "
-PACKAGES += " weston-ivi-config "
-PACKAGES += " weston-ivi "
-
-weston-ivi-config-modello_files = ""
-MANIFESTFILES_${PN}-config-modello = "weston-ivi.manifest"
-
-weston-ivi-config_files = ""
-weston-ivi-config_files += "${sysconfdir}/xdg/weston/weston.ini"
-CONFFILES_${PN}-config = ""
-CONFFILES_${PN}-config += "${sysconfdir}/xdg/weston/weston.ini"
-MANIFESTFILES_${PN}-config = "weston-ivi.manifest"
-
-weston-ivi_files = ""
-weston-ivi_files += "${prefix}/lib/systemd/user/weston.service"
-weston-ivi_files += "${prefix}/lib/systemd/user/weston.target.wants/weston.service"
-weston-ivi_files += "${sysconfdir}/profile.d/*"
-CONFFILES_${PN} = ""
-CONFFILES_${PN} += "${sysconfdir}/profile.d/*"
-MANIFESTFILES_${PN} = "weston-ivi.manifest"
-
-FILES_${PN}-config-modello = "${weston-ivi-config-modello_files}"
-FILES_${PN}-config = "${weston-ivi-config_files}"
-FILES_${PN} = "${weston-ivi_files}"
-
-PKG_weston-ivi-config-modello= "weston-ivi-config-modello"
-PKG_weston-ivi-config= "weston-ivi-config"
-PKG_weston-ivi= "weston-ivi"
-
-require weston-ivi-extraconf.inc
-

diff --git a/meta-tizen-ivi/recipes-graphics/weston-ivi/weston-ivi_git.bb b/meta-tizen-ivi/recipes-graphics/weston-ivi/weston-ivi_git.bb
deleted file mode 100644 (file)
index 13f9a61..0000000
--- a/meta-tizen-ivi/recipes-graphics/weston-ivi/weston-ivi_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require weston-ivi.inc
-
-PRIORITY = "10"
-
-LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI += "git://review.tizen.org/profile/ivi/weston-ivi;tag=c9c00219d70e399d471fe61c658afa77cf48e84c;nobranch=1"
-
-BBCLASSEXTEND += " native "
-

diff --git a/meta-tizen-ivi/recipes-image/images/tizen-ivi-Modello-image.bb b/meta-tizen-ivi/recipes-image/images/tizen-ivi-Modello-image.bb
index 1b7321a..41467aa 100644 (file)
--- a/meta-tizen-ivi/recipes-image/images/tizen-ivi-Modello-image.bb
+++ b/meta-tizen-ivi/recipes-image/images/tizen-ivi-Modello-image.bb
@@ -6,6 +6,7 @@ LICENSE = "MIT"
 
 DESCRIPTION = "A Tizen IVI image based on Tizen ivi with Modello ."
 
+TLMCONFIG = "tlm-config-ivi-singleseat-modello"
 
 # Modello packages
 CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-ivi-modello"

diff --git a/meta-tizen-ivi/recipes-image/images/tizen-ivi-core-image.bb b/meta-tizen-ivi/recipes-image/images/tizen-ivi-core-image.bb
index 6467fc4..11b6d01 100644 (file)
--- a/meta-tizen-ivi/recipes-image/images/tizen-ivi-core-image.bb
+++ b/meta-tizen-ivi/recipes-image/images/tizen-ivi-core-image.bb
@@ -14,12 +14,12 @@ LICENSE = "MIT"
 
 DESCRIPTION = "A Tizen IVI image based on Tizen common ."
 
-# weston-init is from OE-core and not used in Tizen IVI. Weston config
-# files are provided by tlm-config-* and weston-ivi-config.
-# weston-ivi-config-modello does not seem to be used.
+# weston-init is from OE-core and not used in Tizen IVI.
 CORE_IMAGE_BASE_INSTALL_remove = "weston-init"
 
-WESTONINI = "weston-ivi-config"
+# Weston config files are provided by tlm-config-* in recent Tizen IVI.
+# weston-ivi-config is not used at all anymore.
+WESTONINI = ""
 
 CORE_IMAGE_EXTRA_INSTALL += "automotive-message-broker"
 CORE_IMAGE_EXTRA_INSTALL += "efl-theme-tizen-hd"