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>

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 8f1afef..a9a4107 100644 (file)
--- 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"