diff options
| author | Christopher Larson <chris_larson@mentor.com> | 2015-08-24 15:18:33 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 12:35:58 +0100 |
| commit | b3d8b37428696d2ac54a7c1a16b8a27cdabef5ec (patch) | |
| tree | fdcf715a9efb0aab046077d1c67a7e700f27cd69 | |
| parent | 641b2e2b1a51b975bcd63ca8e0274664a35fd2be (diff) | |
| download | poky-b3d8b37428696d2ac54a7c1a16b8a27cdabef5ec.tar.gz | |
image.bbclass: re-run do_rootfs when feature packages change
Currently, FEATURE_PACKAGE_<feature> isn't in any vardeps, so changing the
packages for a feature won't change the checksum for do_rootfs. Rather than
explicitly adding those to vardeps, just use the expanded form of
FEATURE_INSTALL and FEATURE_INSTALL_OPTIONAL, so the actual list of packages
from the features goes into the checksum.
(From OE-Core rev: fdd1669e04bd8219344b1896b9d9c6a187e4f84e)
(From OE-Core rev: 9697d13e48633515b80b2ab9bab84ca54ce3ed48)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ff2ed0d09a..4e66535407 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
| @@ -32,7 +32,9 @@ ROOTFS_BOOTSTRAP_INSTALL = "${@bb.utils.contains("IMAGE_FEATURES", "package-mana | |||
| 32 | 32 | ||
| 33 | # packages to install from features | 33 | # packages to install from features |
| 34 | FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" | 34 | FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" |
| 35 | FEATURE_INSTALL[vardepvalue] = "${FEATURE_INSTALL}" | ||
| 35 | FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" | 36 | FEATURE_INSTALL_OPTIONAL = "${@' '.join(oe.packagegroup.optional_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" |
| 37 | FEATURE_INSTALL_OPTIONAL[vardepvalue] = "${FEATURE_INSTALL_OPTIONAL}" | ||
| 36 | 38 | ||
| 37 | # Define some very basic feature package groups | 39 | # Define some very basic feature package groups |
| 38 | FEATURE_PACKAGES_package-management = "${ROOTFS_PKGMANAGE}" | 40 | FEATURE_PACKAGES_package-management = "${ROOTFS_PKGMANAGE}" |