diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2010-10-14 07:31:32 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-10-14 08:52:43 -0700 |
| commit | c30bd83438f9adcd9e6c666cc4d4d2b433b1782f (patch) | |
| tree | 6a819479bbea503c01262ad2b7904091c6140cba | |
| parent | 051d97508315763fd2b36c537f7f3a7521d63daf (diff) | |
| download | openembedded-c30bd83438f9adcd9e6c666cc4d4d2b433b1782f.tar.gz | |
image.bbclass: use un-renamed packages in RDEPENDS
The issue was that PACKAGE_INSTALL* get debian package renaming applied, but
this renaming is outside of bitbake's knowledge. Making RDEPENDS use
PACKAGE_INSTALL, therefore, caused problems when adding libraries to images
directly rather than indirectly.
While I'm at it, change it to ensure PACKAGE_INSTALL_ATTEMPTONLY packages
also end up in RDEPENDS, not renamed.
Reported-by: Tasslehoff Kjappfot <tasskjapp@gmail.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
| -rw-r--r-- | classes/image.bbclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index 8f1afef1d6..a9a410740e 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -39,6 +39,8 @@ LINGUAS_INSTALL_linux-gnueabi = "${LINGUAS_INSTALL_linux}" PACKAGE_INSTALL = "${@' '.join(oe.packagegroup.required_packages('${IMAGE_FEATURES}'.split(), d))}" PACKAGE_INSTALL_ATTEMPTONLY = "${@' '.join(oe.packagegroup.optional_packages('${IMAGE_FEATURES}'.split(), d))}" +RDEPENDS += "${@' '.join(oe.packagegroup.active_packages('${IMAGE_FEATURES}'.split(), d))}" + IMAGE_FEATURES ?= "" IMAGE_FEATURES_prepend = "image_base " @@ -72,9 +74,6 @@ PACKAGE_GROUP_dev[optional] = "1" PACKAGE_GROUP_doc = "${@string_set('%s-doc' % pn for pn in oe.packagegroup.active_recipes(image_features_noextras(d), d))}" PACKAGE_GROUP_doc[optional] = "1" - -RDEPENDS += "${PACKAGE_INSTALL}" - # "export IMAGE_BASENAME" not supported at this time IMAGE_BASENAME[export] = "1" |