Add IVI package groups

* Modello package group.
* ICO package group.

Also clean crosswalk and font package groups files.

Change-Id: If8ed1c5bc40af85ffab00ae27fa6f902d833d67f
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/recipes-image/images/tizen-ivi-core-image.bb b/recipes-image/images/tizen-ivi-core-image.bb
index 4790731..b6dc243 100644 (file)
--- a/recipes-image/images/tizen-ivi-core-image.bb
+++ b/recipes-image/images/tizen-ivi-core-image.bb
@@ -1,49 +1,32 @@
 require recipes-image/images/tizen-core-image-minimal.bb
 
-SUMMARY = "A Tizen ivi image"
+SUMMARY = "Tizen IVI image"
 
 LICENSE = "MIT"
 
-DESCRIPTION = "A Tizen ivi image base on Tizen common ."
+DESCRIPTION = "A Tizen IVI image based on Tizen common ."
 
 WESTONSTARTUP = "weston-ivi"
 IMAGECONFIG = "config-tizen-ivi"
 
-CORE_IMAGE_EXTRA_INSTALL += "Modello_AMBSimulator"
-CORE_IMAGE_EXTRA_INSTALL += "Modello_Appmanager"
-CORE_IMAGE_EXTRA_INSTALL += "Modello_Common"
-CORE_IMAGE_EXTRA_INSTALL += "Modello_Dashboard"
-CORE_IMAGE_EXTRA_INSTALL += "Modello_Homescreen"
-CORE_IMAGE_EXTRA_INSTALL += "Modello_Hvac"
-CORE_IMAGE_EXTRA_INSTALL += "Modello_Multimediaplayer"
-CORE_IMAGE_EXTRA_INSTALL += "Modello_Nav"
-CORE_IMAGE_EXTRA_INSTALL += "Modello_SDL"
+# Modello packages
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-ivi-modello"
 
 CORE_IMAGE_EXTRA_INSTALL += "automotive-message-broker"
 CORE_IMAGE_EXTRA_INSTALL += "efl-theme-tizen-hd"
 CORE_IMAGE_EXTRA_INSTALL += "festival"
 CORE_IMAGE_EXTRA_INSTALL += "genivi-audio-manager"
 
-#ico packages seems to be optional for IVI
-#CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-device-input-controller"
-#CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-homescreen"
-#CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-utilities"
-#CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-weston-plugin"
-#CORE_IMAGE_EXTRA_INSTALL += "ico-vic-amb-plugin"
-#CORE_IMAGE_EXTRA_INSTALL += "ico-vic-carsimulator"
-#CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-homescreen-sample-apps"
-
 CORE_IMAGE_EXTRA_INSTALL += "lemolo"
 CORE_IMAGE_EXTRA_INSTALL += "libwebsockets"
 CORE_IMAGE_EXTRA_INSTALL += "murphy"
 CORE_IMAGE_EXTRA_INSTALL += "node-startup-controller"
 CORE_IMAGE_EXTRA_INSTALL += "pulseaudio-module-murphy-ivi"
 CORE_IMAGE_EXTRA_INSTALL += "weston-ivi-config"
+
 # TMP Remove rygel
 # BTY-36
 #CORE_IMAGE_EXTRA_INSTALL += "rygel"
-#CORE_IMAGE_EXTRA_INSTALL += "Modello_Phone"
-#CORE_IMAGE_EXTRA_INSTALL += "Modello_Installer"
 
 CORE_IMAGE_EXTRA_INSTALL += "sphinxbase"
 CORE_IMAGE_EXTRA_INSTALL += "udev-rules-ivi"

diff --git a/recipes-image/packagegroups/packagegroups-ivi.bb b/recipes-image/packagegroups/packagegroups-ivi.bb
new file mode 100644 (file)
index 0000000..f863a4c
--- /dev/null
+++ b/recipes-image/packagegroups/packagegroups-ivi.bb
@@ -0,0 +1,35 @@
+SUMMARY = "Tizen IVI packagegroups"
+LICENSE = "Apache-2.0"
+DESCRIPTION = "ICO and Modello packages."
+
+inherit packagegroup
+
+PACKAGES = "\
+            packagegroup-tizen-ivi-ico \
+            packagegroup-tizen-ivi-modello \
+            "
+
+# ICO packages
+RDEPENDS_packagegroup-tizen-ivi-ico = " \
+                                        ico-uxf-device-input-controller \
+                                        ico-uxf-homescreen \
+                                        ico-uxf-utilities \
+                                        ico-uxf-weston-plugin \
+                                        ico-vic-amb-plugin \
+                                        ico-vic-carsimulator \
+                                        ico-uxf-homescreen-sample-apps \
+                                        "
+
+# Modello modules
+# To add: "Modello_Phone", "Modello_Installer" (related to BTY-36)
+RDEPENDS_packagegroup-tizen-ivi-modello = " \
+                                            Modello_AMBSimulator \
+                                            Modello_Appmanager \
+                                            Modello_Common \
+                                            Modello_Dashboard \
+                                            Modello_Homescreen \
+                                            Modello_Hvac \
+                                            Modello_Multimediaplayer \
+                                            Modello_Nav \
+                                            Modello_SDL \
+                                            "

diff --git a/recipes-image/packagegroups/packagegroups-tizen-crosswalk.bb b/recipes-image/packagegroups/packagegroups-tizen-crosswalk.bb
index 57b6ee0..45ea8a3 100644 (file)
--- a/recipes-image/packagegroups/packagegroups-tizen-crosswalk.bb
+++ b/recipes-image/packagegroups/packagegroups-tizen-crosswalk.bb
@@ -6,6 +6,8 @@ inherit packagegroup
 
 PACKAGES = "packagegroup-tizen-crosswalk"
 
-RDEPENDS_packagegroup-tizen-crosswalk = "crosswalk"
-RDEPENDS_packagegroup-tizen-crosswalk += "tizen-extensions-crosswalk"
-RDEPENDS_packagegroup-tizen-crosswalk += "wrt-widgets"
\ No newline at end of file
+RDEPENDS_packagegroup-tizen-crosswalk = "\
+                                        crosswalk \
+                                        tizen-extensions-crosswalk \
+                                        wrt-widgets \
+                                        "

diff --git a/recipes-image/packagegroups/packagegroups-tizen-fonts.bb b/recipes-image/packagegroups/packagegroups-tizen-fonts.bb
index fcba7f0..d088f43 100644 (file)
--- a/recipes-image/packagegroups/packagegroups-tizen-fonts.bb
+++ b/recipes-image/packagegroups/packagegroups-tizen-fonts.bb
@@ -20,7 +20,7 @@ RDEPENDS_packagegroup-tizen-fonts-ttf = "\
                                         "
 
 # Pango modules
-RDEPENDS_packagegroup-tizen-fonts-pango += "\
+RDEPENDS_packagegroup-tizen-fonts-pango = " \
                                             pango-module-basic-fc \
                                             pango-module-arabic-lang \
                                             pango-module-indic-lang \