From b14a92f4450bb08b9f11d3fd7a99155315527cdd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 3 Feb 2012 15:49:39 -0800 Subject: classes,recipes: Replace POKY_* with CORE_IMAGE_* Signed-off-by: Khem Raj --- meta/classes/core-image.bbclass | 8 ++++---- meta/recipes-core/images/core-image-minimal.bb | 2 +- meta/recipes-core/images/self-hosted-image.bb | 2 +- meta/recipes-extended/images/core-image-basic.bb | 2 +- meta/recipes-extended/images/core-image-lsb-dev.bb | 2 +- meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 +- meta/recipes-extended/images/core-image-lsb.bb | 2 +- meta/recipes-graphics/images/core-image-clutter.bb | 2 +- meta/recipes-graphics/images/core-image-gtk-directfb.bb | 2 +- meta/recipes-qt/images/qt4e-demo-image.bb | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) (limited to 'meta') diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index c08895ff2d..668297bd40 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -47,18 +47,18 @@ PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh" PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos" -POKY_BASE_INSTALL = '\ +CORE_IMAGE_BASE_INSTALL = '\ task-core-boot \ task-base-extended \ \ ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ \ - ${POKY_EXTRA_INSTALL} \ + ${CORE_IMAGE_EXTRA_INSTALL} \ ' -POKY_EXTRA_INSTALL ?= "" +CORE_IMAGE_EXTRA_INSTALL ?= "" -IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" +IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}" X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb index 687f72a4cc..7953b805a6 100644 --- a/meta/recipes-core/images/core-image-minimal.bb +++ b/meta/recipes-core/images/core-image-minimal.bb @@ -3,7 +3,7 @@ # DESCRIPTION = "A small image just capable of allowing a device to boot." -IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${POKY_EXTRA_INSTALL}" +IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" IMAGE_LINGUAS = " " diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb index 5029ac2fbb..a0a7592091 100644 --- a/meta/recipes-core/images/self-hosted-image.bb +++ b/meta/recipes-core/images/self-hosted-image.bb @@ -1,6 +1,6 @@ IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" -POKY_EXTRA_INSTALL = "\ +CORE_IMAGE_EXTRA_INSTALL = "\ task-self-hosted \ " diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb index 5e58e60100..f801346376 100644 --- a/meta/recipes-extended/images/core-image-basic.bb +++ b/meta/recipes-extended/images/core-image-basic.bb @@ -8,6 +8,6 @@ IMAGE_INSTALL = "\ task-core-basic \ " -# ${POKY_BASE_INSTALL} +# ${CORE_IMAGE_BASE_INSTALL} inherit core-image diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb index 2d6f6744a8..e6d7bc9d47 100644 --- a/meta/recipes-extended/images/core-image-lsb-dev.bb +++ b/meta/recipes-extended/images/core-image-lsb-dev.bb @@ -5,7 +5,7 @@ standalone SDK." IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh" IMAGE_INSTALL = "\ - ${POKY_BASE_INSTALL} \ + ${CORE_IMAGE_BASE_INSTALL} \ task-core-basic \ task-core-lsb \ " diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb index 105c8db8a8..08928913f0 100644 --- a/meta/recipes-extended/images/core-image-lsb-sdk.bb +++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb @@ -7,7 +7,7 @@ EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" IMAGE_INSTALL = "\ - ${POKY_BASE_INSTALL} \ + ${CORE_IMAGE_BASE_INSTALL} \ task-core-basic \ task-core-lsb \ " diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb index f6696183e6..b0a3a4dfa0 100644 --- a/meta/recipes-extended/images/core-image-lsb.bb +++ b/meta/recipes-extended/images/core-image-lsb.bb @@ -4,7 +4,7 @@ conform to Linux Standard Base (LSB)." IMAGE_FEATURES += "apps-console-core ssh-server-openssh" IMAGE_INSTALL = "\ - ${POKY_BASE_INSTALL} \ + ${CORE_IMAGE_BASE_INSTALL} \ task-core-basic \ task-core-lsb \ " diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb index 636238a6d1..6c49a02625 100644 --- a/meta/recipes-graphics/images/core-image-clutter.bb +++ b/meta/recipes-graphics/images/core-image-clutter.bb @@ -6,7 +6,7 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" LICENSE = "MIT" IMAGE_INSTALL = "\ - ${POKY_BASE_INSTALL} \ + ${CORE_IMAGE_BASE_INSTALL} \ task-core-clutter-core \ task-core-clutter-tests \ task-core-clutter-apps" diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb b/meta/recipes-graphics/images/core-image-gtk-directfb.bb index 87b3a86de7..a5fba17f89 100644 --- a/meta/recipes-graphics/images/core-image-gtk-directfb.bb +++ b/meta/recipes-graphics/images/core-image-gtk-directfb.bb @@ -15,7 +15,7 @@ RDEPENDS_${PN} += " \ inherit core-image IMAGE_INSTALL += "\ - ${POKY_BASE_INSTALL} \ + ${CORE_IMAGE_BASE_INSTALL} \ task-core-basic \ module-init-tools \ task-core-gtk-directfb-base \ diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb index 652337926b..2e50bf6029 100644 --- a/meta/recipes-qt/images/qt4e-demo-image.bb +++ b/meta/recipes-qt/images/qt4e-demo-image.bb @@ -11,7 +11,7 @@ RDEPENDS_${PN} += " \ " IMAGE_INSTALL += "\ - ${POKY_BASE_INSTALL} \ + ${CORE_IMAGE_BASE_INSTALL} \ module-init-tools \ task-qt4e-base \ " -- cgit 1.2.3-korg