Use package groups in image recipes

Use package groups in image recipes instead of packages.
Also clean "tizen-core-image-minimal.bb".

Bug-Tizen: BTY-17
Change-Id: I3eb6dc693b864e7482c0726b354be65ea962a4c7
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/recipes-image/images/tizen-common-core-image-crosswalk.bb b/recipes-image/images/tizen-common-core-image-crosswalk.bb
index a587b8e..301411d 100644 (file)
--- a/recipes-image/images/tizen-common-core-image-crosswalk.bb
+++ b/recipes-image/images/tizen-common-core-image-crosswalk.bb
@@ -6,21 +6,8 @@ LICENSE = "MIT"
 
 DESCRIPTION = "A weston image with Tizen common ."
 
-CORE_IMAGE_EXTRA_INSTALL += "crosswalk"
-#CORE_IMAGE_EXTRA_INSTALL += "tizen-extensions-crosswalk"
-CORE_IMAGE_EXTRA_INSTALL += "tzdata"
-
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-common"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-sans"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-sans-condensed"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-sans-mono"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-serif"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-serif-condensed"
-
-# Pango modules
-CORE_IMAGE_EXTRA_INSTALL += "pango-module-basic-fc"
-CORE_IMAGE_EXTRA_INSTALL += "pango-module-arabic-lang"
-CORE_IMAGE_EXTRA_INSTALL += "pango-module-indic-lang"
+# Crosswalk
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
 
-
-CORE_IMAGE_EXTRA_INSTALL += "libpulsecommon"
\ No newline at end of file
+# Time zone
+CORE_IMAGE_EXTRA_INSTALL += "tzdata"

diff --git a/recipes-image/images/tizen-common-core-image-minimal.bb b/recipes-image/images/tizen-common-core-image-minimal.bb
index befa505..cf0df72 100644 (file)
--- a/recipes-image/images/tizen-common-core-image-minimal.bb
+++ b/recipes-image/images/tizen-common-core-image-minimal.bb
@@ -1,21 +1,19 @@
 require recipes-image/images/tizen-core-image-minimal.bb
 
 SUMMARY = "A very basic Wayland image with a terminal"
-
-IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs"
-
 LICENSE = "MIT"
+DESCRIPTION = "A weston image with Tizen common."
 
 inherit core-image distro_features_check
 
-REQUIRED_DISTRO_FEATURES = "wayland pam"
-
-CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples clutter-1.0-examples"
-
-DESCRIPTION = "A weston image with Tizen common."
+IMAGE_FEATURES += "splash package-management ssh-server-dropbear hwcodecs"
 
+REQUIRED_DISTRO_FEATURES = "wayland pam"
 
-CORE_IMAGE_BASE_INSTALL +=  "weston-common"
+CORE_IMAGE_BASE_INSTALL += "weston weston-init"
+CORE_IMAGE_BASE_INSTALL += "weston-examples"
+CORE_IMAGE_BASE_INSTALL += "clutter-1.0-examples"
+CORE_IMAGE_BASE_INSTALL += "weston-common"
 CORE_IMAGE_BASE_INSTALL += "weston-common-tz-launcher"
 CORE_IMAGE_BASE_INSTALL += "weston-common-config"
-CORE_IMAGE_BASE_INSTALL += "desktop-skin"
\ No newline at end of file
+CORE_IMAGE_BASE_INSTALL += "desktop-skin"

diff --git a/recipes-image/images/tizen-core-image-minimal.bb b/recipes-image/images/tizen-core-image-minimal.bb
index bccd44e..1847c98 100644 (file)
--- a/recipes-image/images/tizen-core-image-minimal.bb
+++ b/recipes-image/images/tizen-core-image-minimal.bb
@@ -42,4 +42,8 @@ CORE_IMAGE_BASE_INSTALL += "psmisc"
 CORE_IMAGE_BASE_INSTALL += "coreutils"
 CORE_IMAGE_BASE_INSTALL += "procps"
 
+# Fonts
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-fonts-ttf"
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-fonts-pango"
+
 export SYSROOT = "${IMAGE_ROOTFS}"

diff --git a/recipes-image/images/tizen-ivi-core-image.bb b/recipes-image/images/tizen-ivi-core-image.bb
index c97f7e3..0a05ecf 100644 (file)
--- a/recipes-image/images/tizen-ivi-core-image.bb
+++ b/recipes-image/images/tizen-ivi-core-image.bb
@@ -43,21 +43,8 @@ CORE_IMAGE_EXTRA_INSTALL += "udev-rules"
 CORE_IMAGE_EXTRA_INSTALL += "wayland-ivi-extension"
 CORE_IMAGE_EXTRA_INSTALL += "weston-ivi-shell"
 
-CORE_IMAGE_EXTRA_INSTALL += "crosswalk"
-CORE_IMAGE_EXTRA_INSTALL += "tizen-extensions-crosswalk"
-CORE_IMAGE_EXTRA_INSTALL += "tzdata"
-
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-common"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-sans"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-sans-condensed"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-sans-mono"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-serif"
-CORE_IMAGE_EXTRA_INSTALL += "ttf-dejavu-serif-condensed"
-
-# Pango modules
-CORE_IMAGE_EXTRA_INSTALL += "pango-module-basic-fc"
-CORE_IMAGE_EXTRA_INSTALL += "pango-module-arabic-lang"
-CORE_IMAGE_EXTRA_INSTALL += "pango-module-indic-lang"
+# Crosswalk
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
 
-
-CORE_IMAGE_EXTRA_INSTALL += "libpulsecommon"
+# Time zone
+CORE_IMAGE_EXTRA_INSTALL += "tzdata"