From f96264362b28a2df98d29b89ffe84fb32f623d08 Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Wed, 30 Jul 2014 10:13:44 +0200 Subject: [PATCH] Clean image recipes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * "libpulsecommon" is a dependency of Crosswalk so do not install it explicitly in the image recipe but add it as a RDEPENDS of Crosswalk. * Move fonts-related packages from the tizen-common-core-image-crosswalk to the tizen-common-core-image-minimal. Change-Id: I5445c58d270583d9e70f9f293b0573951e51d07e Signed-off-by: Kévin THIERRY --- recipes-image/images/tizen-common-core-image-crosswalk.bb | 15 --------------- recipes-image/images/tizen-common-core-image-minimal.bb | 13 +++++++++++++ recipes-tizen/crosswalk/crosswalk-extraconf.inc | 2 ++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/recipes-image/images/tizen-common-core-image-crosswalk.bb b/recipes-image/images/tizen-common-core-image-crosswalk.bb index a587b8e..70bca59 100644 --- a/recipes-image/images/tizen-common-core-image-crosswalk.bb +++ b/recipes-image/images/tizen-common-core-image-crosswalk.bb @@ -9,18 +9,3 @@ 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" - - -CORE_IMAGE_EXTRA_INSTALL += "libpulsecommon" \ No newline at end of file diff --git a/recipes-image/images/tizen-common-core-image-minimal.bb b/recipes-image/images/tizen-common-core-image-minimal.bb index 9420074..5e78c87 100644 --- a/recipes-image/images/tizen-common-core-image-minimal.bb +++ b/recipes-image/images/tizen-common-core-image-minimal.bb @@ -45,4 +45,17 @@ CORE_IMAGE_BASE_INSTALL += "psmisc" CORE_IMAGE_BASE_INSTALL += "coreutils" CORE_IMAGE_BASE_INSTALL += "procps" +# Fonts +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" + export SYSROOT = "${IMAGE_ROOTFS}" diff --git a/recipes-tizen/crosswalk/crosswalk-extraconf.inc b/recipes-tizen/crosswalk/crosswalk-extraconf.inc index 143316b..3fce185 100644 --- a/recipes-tizen/crosswalk/crosswalk-extraconf.inc +++ b/recipes-tizen/crosswalk/crosswalk-extraconf.inc @@ -18,6 +18,8 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_romley-ivb = "(.*)" COMPATIBLE_MACHINE_valleyisland-64 = "(.*)" +RDEPENDS_${PN} += "libpulsecommon" + do_compile() { cd ${S} LANG=C -- 2.7.4