summaryrefslogtreecommitdiff
path: root/meta/classes
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
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')
-rw-r--r--meta/classes/package_deb.bbclass4
-rw-r--r--meta/classes/package_ipk.bbclass1
-rw-r--r--meta/classes/poky-image.bbclass6
-rw-r--r--meta/classes/rootfs_deb.bbclass3
-rw-r--r--meta/classes/rootfs_ipk.bbclass3
5 files changed, 11 insertions, 6 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index ef0eacf44f..8f5fedada7 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -1,11 +1,9 @@
#
-# Copyright 2006-2007 OpenedHand Ltd.
+# Copyright 2006-2008 OpenedHand Ltd.
#
inherit package
-BOOTSTRAP_EXTRA_RDEPENDS += "dpkg run-postinsts"
-DISTRO_EXTRA_RDEPENDS += "dpkg run-postinsts"
IMAGE_PKGTYPE ?= "deb"
# Map TARGET_ARCH to Debian's ideas about architectures
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 4f669aba8e..f6c71a250d 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -1,6 +1,5 @@
inherit package
-DISTRO_EXTRA_RDEPENDS += "opkg-collateral opkg"
IMAGE_PKGTYPE ?= "ipk"
IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/opkg.conf"
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
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 467626b2b1..eb08f4ace4 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -2,6 +2,9 @@
# Copyright 2006-2007 Openedhand Ltd.
#
+ROOTFS_PKGMANAGE = "run-postinsts dpkg"
+ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
+
do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging"
do_rootfs[recrdeptask] += "do_package_write_deb"
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index a27688a1ac..8a879680c5 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -5,6 +5,9 @@
# See image.bbclass for a usage of this.
#
+ROOTFS_PKGMANAGE = "opkg opkg-collateral"
+ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
+
do_rootfs[depends] += "opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
do_rootfs[recrdeptask] += "do_package_write_ipk"