From c1f183bc5b875e98f577f3aca2008d69b2b39812 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 4 Jul 2014 14:17:59 +0100 Subject: [PATCH] meta-tizen: images: use CORE_IMAGE_BASE_INSTALL Image recipes should use CORE_IMAGE_(BASE/EXTRA)_INSTALL instead of IMAGE_INSTALL directly, unless they have special requirements. Change-Id: I04f16d700332436d3c357794aaeffc8b62b262fa (From meta-tizen rev: 52a2124331aeaf9a2bd7cc259599e8fcb8b0e162) Signed-off-by: Ross Burton Signed-off-by: Patrick Ohly --- .../tizen-common-core-image-crosswalk-dev.bb | 20 +++++++++--------- .../images/tizen-common-core-image-crosswalk.bb | 24 +++++++++++----------- .../images/tizen-common-core-image-minimal-dev.bb | 20 +++++++++--------- .../images/tizen-common-core-image-minimal.bb | 22 ++++++++++---------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk-dev.bb b/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk-dev.bb index 5d73bd8..b1ad874 100644 --- a/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk-dev.bb +++ b/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk-dev.bb @@ -4,13 +4,13 @@ DESCRIPTION = "A weston image with Tizen common and \ is suitable for development work." IMAGE_FEATURES += "dev-pkgs tools-debug debug-tweaks ssh-server-openssh" -IMAGE_INSTALL += "attr" -IMAGE_INSTALL += "util-linux-agetty" -IMAGE_INSTALL += "strace" -IMAGE_INSTALL += "gdb" -IMAGE_INSTALL += "lsof" -IMAGE_INSTALL += "screen" -IMAGE_INSTALL += "ldd" -IMAGE_INSTALL += "libcap" -IMAGE_INSTALL += "sudo" -IMAGE_INSTALL += "connman-client" +CORE_IMAGE_EXTRA_INSTALL += "attr" +CORE_IMAGE_EXTRA_INSTALL += "util-linux-agetty" +CORE_IMAGE_EXTRA_INSTALL += "strace" +CORE_IMAGE_EXTRA_INSTALL += "gdb" +CORE_IMAGE_EXTRA_INSTALL += "lsof" +CORE_IMAGE_EXTRA_INSTALL += "screen" +CORE_IMAGE_EXTRA_INSTALL += "ldd" +CORE_IMAGE_EXTRA_INSTALL += "libcap" +CORE_IMAGE_EXTRA_INSTALL += "sudo" +CORE_IMAGE_EXTRA_INSTALL += "connman-client" diff --git a/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk.bb b/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk.bb index db95f2b..6eaae8f 100644 --- a/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk.bb +++ b/meta-tizen/recipes-image/images/tizen-common-core-image-crosswalk.bb @@ -6,18 +6,18 @@ LICENSE = "MIT" DESCRIPTION = "A weston image with Tizen common ." -IMAGE_INSTALL += "crosswalk" -#IMAGE_INSTALL += "tizen-extensions-crosswalk" -IMAGE_INSTALL += "tzdata" +CORE_IMAGE_EXTRA_INSTALL += "crosswalk" +#CORE_IMAGE_EXTRA_INSTALL += "tizen-extensions-crosswalk" +CORE_IMAGE_EXTRA_INSTALL += "tzdata" -IMAGE_INSTALL += "ttf-dejavu-common" -IMAGE_INSTALL += "ttf-dejavu-sans" -IMAGE_INSTALL += "ttf-dejavu-sans-condensed" -IMAGE_INSTALL += "ttf-dejavu-sans-mono" -IMAGE_INSTALL += "ttf-dejavu-serif" -IMAGE_INSTALL += "ttf-dejavu-serif-condensed" +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 -IMAGE_INSTALL += "pango-module-basic-fc" -IMAGE_INSTALL += "pango-module-arabic-lang" -IMAGE_INSTALL += "pango-module-indic-lang" \ No newline at end of file +CORE_IMAGE_EXTRA_INSTALL += "pango-module-basic-fc" +CORE_IMAGE_EXTRA_INSTALL += "pango-module-arabic-lang" +CORE_IMAGE_EXTRA_INSTALL += "pango-module-indic-lang" \ No newline at end of file diff --git a/meta-tizen/recipes-image/images/tizen-common-core-image-minimal-dev.bb b/meta-tizen/recipes-image/images/tizen-common-core-image-minimal-dev.bb index b41821b..7e94fa8 100644 --- a/meta-tizen/recipes-image/images/tizen-common-core-image-minimal-dev.bb +++ b/meta-tizen/recipes-image/images/tizen-common-core-image-minimal-dev.bb @@ -4,13 +4,13 @@ DESCRIPTION = "A weston image with Tizen common and \ is suitable for development work." IMAGE_FEATURES += "dev-pkgs tools-debug debug-tweaks ssh-server-openssh" -IMAGE_INSTALL += "attr" -IMAGE_INSTALL += "util-linux-agetty" -IMAGE_INSTALL += "strace" -IMAGE_INSTALL += "gdb" -IMAGE_INSTALL += "lsof" -IMAGE_INSTALL += "screen" -IMAGE_INSTALL += "ldd" -IMAGE_INSTALL += "libcap" -IMAGE_INSTALL += "sudo" -IMAGE_INSTALL += "connman-client" \ No newline at end of file +CORE_IMAGE_EXTRA_INSTALL += "attr" +CORE_IMAGE_EXTRA_INSTALL += "util-linux-agetty" +CORE_IMAGE_EXTRA_INSTALL += "strace" +CORE_IMAGE_EXTRA_INSTALL += "gdb" +CORE_IMAGE_EXTRA_INSTALL += "lsof" +CORE_IMAGE_EXTRA_INSTALL += "screen" +CORE_IMAGE_EXTRA_INSTALL += "ldd" +CORE_IMAGE_EXTRA_INSTALL += "libcap" +CORE_IMAGE_EXTRA_INSTALL += "sudo" +CORE_IMAGE_EXTRA_INSTALL += "connman-client" \ No newline at end of file diff --git a/meta-tizen/recipes-image/images/tizen-common-core-image-minimal.bb b/meta-tizen/recipes-image/images/tizen-common-core-image-minimal.bb index f1e07f6..32db1d7 100644 --- a/meta-tizen/recipes-image/images/tizen-common-core-image-minimal.bb +++ b/meta-tizen/recipes-image/images/tizen-common-core-image-minimal.bb @@ -14,14 +14,14 @@ DESCRIPTION = "A weston image with Tizen common." DEPENDS += " tar-replacement-native " -IMAGE_INSTALL += "connman" -IMAGE_INSTALL += "weston-common" -IMAGE_INSTALL += "mesa-megadriver" -IMAGE_INSTALL += "meta-common" -IMAGE_INSTALL += "pam" -IMAGE_INSTALL += "weston-common-tz-launcher" -IMAGE_INSTALL += "weston-common-config" -IMAGE_INSTALL += "user-session-units" -IMAGE_INSTALL += "default-ac-domains" -IMAGE_INSTALL += "desktop-skin" -IMAGE_INSTALL += "rpm-security-plugin" +CORE_IMAGE_BASE_INSTALL += "connman" +CORE_IMAGE_BASE_INSTALL += "weston-common" +CORE_IMAGE_BASE_INSTALL += "mesa-megadriver" +CORE_IMAGE_BASE_INSTALL += "meta-common" +CORE_IMAGE_BASE_INSTALL += "pam" +CORE_IMAGE_BASE_INSTALL += "weston-common-tz-launcher" +CORE_IMAGE_BASE_INSTALL += "weston-common-config" +CORE_IMAGE_BASE_INSTALL += "user-session-units" +CORE_IMAGE_BASE_INSTALL += "default-ac-domains" +CORE_IMAGE_BASE_INSTALL += "desktop-skin" +CORE_IMAGE_BASE_INSTALL += "rpm-security-plugin" -- 2.7.4