aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-02-03 15:49:39 -0800
committerSaul Wold <sgw@linux.intel.com>2012-02-07 15:05:42 -0800
commitb14a92f4450bb08b9f11d3fd7a99155315527cdd (patch)
tree5ea90be81f648a4ee9e76d22345a0d3a25539bea
parentf6056cf0e7c76f2f3df650b088ce84df41ec14ca (diff)
downloadopenembedded-core-contrib-b14a92f4450bb08b9f11d3fd7a99155315527cdd.tar.gz
openembedded-core-contrib-b14a92f4450bb08b9f11d3fd7a99155315527cdd.tar.bz2
openembedded-core-contrib-b14a92f4450bb08b9f11d3fd7a99155315527cdd.zip
classes,recipes: Replace POKY_* with CORE_IMAGE_*
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta/classes/core-image.bbclass8
-rw-r--r--meta/recipes-core/images/core-image-minimal.bb2
-rw-r--r--meta/recipes-core/images/self-hosted-image.bb2
-rw-r--r--meta/recipes-extended/images/core-image-basic.bb2
-rw-r--r--meta/recipes-extended/images/core-image-lsb-dev.bb2
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk.bb2
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb2
-rw-r--r--meta/recipes-graphics/images/core-image-clutter.bb2
-rw-r--r--meta/recipes-graphics/images/core-image-gtk-directfb.bb2
-rw-r--r--meta/recipes-qt/images/qt4e-demo-image.bb2
10 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index c08895ff2df..668297bd408 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 687f72a4cc9..7953b805a6f 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 5029ac2fbb3..a0a75920914 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 5e58e60100d..f8013463769 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 2d6f6744a8d..e6d7bc9d47b 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 105c8db8a85..08928913f06 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 f6696183e6c..b0a3a4dfa02 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 636238a6d19..6c49a02625a 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 87b3a86de74..a5fba17f892 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 652337926b4..2e50bf6029e 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 \
"