summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-02-03 15:49:39 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-08 00:50:29 +0000
commitd6b885b1b5299d2c0c539f552bafc53569bbc2d3 (patch)
tree70436dc95247ecf7b435eea58a5dc78ad81eafd4 /meta/classes
parent41936cd5bcfddfbf3374174c1e3cdea951d2d10f (diff)
downloadpoky-d6b885b1b5299d2c0c539f552bafc53569bbc2d3.tar.gz
classes,recipes: Replace POKY_* with CORE_IMAGE_*
(From OE-Core rev: b14a92f4450bb08b9f11d3fd7a99155315527cdd) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/core-image.bbclass8
1 files changed, 4 insertions, 4 deletions
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"
47PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" 47PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
48PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos" 48PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"
49 49
50POKY_BASE_INSTALL = '\ 50CORE_IMAGE_BASE_INSTALL = '\
51 task-core-boot \ 51 task-core-boot \
52 task-base-extended \ 52 task-base-extended \
53 \ 53 \
54 ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ 54 ${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
55 \ 55 \
56 ${POKY_EXTRA_INSTALL} \ 56 ${CORE_IMAGE_EXTRA_INSTALL} \
57 ' 57 '
58 58
59POKY_EXTRA_INSTALL ?= "" 59CORE_IMAGE_EXTRA_INSTALL ?= ""
60 60
61IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" 61IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
62 62
63X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" 63X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
64ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" 64ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management"