summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-03-06 16:46:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 14:45:21 +0000
commit874ab5a568ddbd5b140915c1330e6513e9892666 (patch)
treeab5923fd97c6348c0a0eaafac96a8408104d7654
parent91c372f287732cdedbd7c1204c6ba5f34e5b93f6 (diff)
downloadpoky-874ab5a568ddbd5b140915c1330e6513e9892666.tar.gz
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]. (From OE-Core rev: 18b8e526570b347d269fa47140949e4ea4800ac5) 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.bbclass1
-rw-r--r--meta/classes/image.bbclass3
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
43PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server" 43PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server"
44PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" 44PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
45PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh" 45PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh"
46PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
47PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demoapps" 46PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demoapps"
48PACKAGE_GROUP_hwcodecs = "${MACHINE_HWCODECS}" 47PACKAGE_GROUP_hwcodecs = "${MACHINE_HWCODECS}"
49 48
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}
22# IMAGE_FEATURES may contain any available package group 22# IMAGE_FEATURES may contain any available package group
23IMAGE_FEATURES ?= "" 23IMAGE_FEATURES ?= ""
24IMAGE_FEATURES[type] = "list" 24IMAGE_FEATURES[type] = "list"
25IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs package-management" 25IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs"
26 26
27# rootfs bootstrap install 27# rootfs bootstrap install
28ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}" 28ROOTFS_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
32FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" 32FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
33 33
34# Define some very basic feature package groups 34# Define some very basic feature package groups
35PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
35SPLASH ?= "psplash" 36SPLASH ?= "psplash"
36PACKAGE_GROUP_splash = "${SPLASH}" 37PACKAGE_GROUP_splash = "${SPLASH}"
37 38