diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-03-06 16:46:09 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-07 14:44:25 +0000 |
| commit | 18b8e526570b347d269fa47140949e4ea4800ac5 (patch) | |
| tree | 3c9bbd19233469a105b378199e44925f60352d12 | |
| parent | 959396d5319df6d6599cc74077e85182768b92af (diff) | |
| download | openembedded-core-18b8e526570b347d269fa47140949e4ea4800ac5.tar.gz openembedded-core-18b8e526570b347d269fa47140949e4ea4800ac5.tar.bz2 openembedded-core-18b8e526570b347d269fa47140949e4ea4800ac5.zip | |
classes/image: support package-management in IMAGE_FEATURES
Previously the "package-management" feature was only fully supported
when inheriting core-image.bbclass, which is not really ideal given that
this is the standard way of adding runtime packaging to an image in
OE-Core.
Part of the fix for [YOCTO #5424].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/core-image.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 9ccc128be9..0958702660 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -43,7 +43,6 @@ PACKAGE_GROUP_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sd PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server" PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh" -PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demoapps" PACKAGE_GROUP_hwcodecs = "${MACHINE_HWCODECS}" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 64f4359124..7529212ee8 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -22,7 +22,7 @@ inherit ${TESTIMAGECLASS} # IMAGE_FEATURES may contain any available package group IMAGE_FEATURES ?= "" IMAGE_FEATURES[type] = "list" -IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs package-management" +IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs" # rootfs bootstrap install ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}" @@ -32,6 +32,7 @@ FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_v FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" # Define some very basic feature package groups +PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" SPLASH ?= "psplash" PACKAGE_GROUP_splash = "${SPLASH}" |