summaryrefslogtreecommitdiff
path: root/meta/classes/poky-image.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-20 14:58:34 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-20 14:58:34 +0000
commitbfe8092d3b82939eed9955b58df32274b61f5447 (patch)
tree9a9d61700de25763a549f991a4677294c9fc7c4b /meta/classes/poky-image.bbclass
parent03c0969ef80acf0cf3a3d1d3485df61081fafc1b (diff)
downloadopenembedded-core-bfe8092d3b82939eed9955b58df32274b61f5447.tar.gz
openembedded-core-bfe8092d3b82939eed9955b58df32274b61f5447.tar.bz2
openembedded-core-bfe8092d3b82939eed9955b58df32274b61f5447.zip
poky-image.bbclass: Correctly handle inserting package-managers into images by making it an image feature
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4517 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/poky-image.bbclass')
-rw-r--r--meta/classes/poky-image.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass
index 41d5527960..8f7daa3ae2 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/poky-image.bbclass
@@ -73,12 +73,14 @@ POKY_BASE_INSTALL = '\
${@base_contains("IMAGE_FEATURES", "nfs-server", "task-poky-nfs-server", "",d)} \
${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-poky-nfs-server-dbg", "",d)} \
${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-poky-nfs-server-dev", "",d)} \
+ \
+ ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "",d)} \
'
IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
-X11_IMAGE_FEATURES = "x11-base apps-x11-core"
-SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico"
+X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
+SATO_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-sato apps-x11-games apps-x11-pimlico package-management"
inherit image