diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/core-image.bbclass | 26 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 7 |
2 files changed, 18 insertions, 15 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 0958702660..7475d7d8d5 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -32,19 +32,19 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d # - doc-pkgs - documentation packages for all installed packages in the rootfs # - read-only-rootfs - tweaks an image to support read-only rootfs # -PACKAGE_GROUP_x11 = "packagegroup-core-x11" -PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base" -PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato" -PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug" -PACKAGE_GROUP_eclipse-debug = "packagegroup-core-eclipse-debug" -PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile" -PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps" -PACKAGE_GROUP_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target" -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_qt4-pkgs = "packagegroup-core-qt-demoapps" -PACKAGE_GROUP_hwcodecs = "${MACHINE_HWCODECS}" +FEATURE_PACKAGES_x11 = "packagegroup-core-x11" +FEATURE_PACKAGES_x11-base = "packagegroup-core-x11-base" +FEATURE_PACKAGES_x11-sato = "packagegroup-core-x11-sato" +FEATURE_PACKAGES_tools-debug = "packagegroup-core-tools-debug" +FEATURE_PACKAGES_eclipse-debug = "packagegroup-core-eclipse-debug" +FEATURE_PACKAGES_tools-profile = "packagegroup-core-tools-profile" +FEATURE_PACKAGES_tools-testapps = "packagegroup-core-tools-testapps" +FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target" +FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server" +FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" +FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh" +FEATURE_PACKAGES_qt4-pkgs = "packagegroup-core-qt-demoapps" +FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}" # IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2' diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 7529212ee8..51d16d7d55 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -32,9 +32,9 @@ 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}" +FEATURE_PACKAGES_package-management = "${ROOTFS_PKGMANAGE}" SPLASH ?= "psplash" -PACKAGE_GROUP_splash = "${SPLASH}" +FEATURE_PACKAGES_splash = "${SPLASH}" IMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("IMAGE_FEATURES", d)}' @@ -43,7 +43,10 @@ def check_image_features(d): valid_features += d.getVarFlags('COMPLEMENTARY_GLOB').keys() for var in d: if var.startswith("PACKAGE_GROUP_"): + bb.warn("PACKAGE_GROUP is deprecated, please use FEATURE_PACKAGES instead") valid_features.append(var[14:]) + elif var.startswith("FEATURE_PACKAGES_"): + valid_features.append(var[17:]) valid_features.sort() features = set(oe.data.typed_value('IMAGE_FEATURES', d)) |