From: Mark Hatle <mark.hatle@windriver.com>
Date: Fri, 7 Sep 2012 22:05:43 +0000 (-0500)
Subject: image.bbclass: Enable the complementary install to be called w/ globbing params
X-Git-Tag: 2015-4~9208
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f44c5f227a170290f567d0a0a24baaa870048788;p=openembedded-core.git

image.bbclass: Enable the complementary install to be called w/ globbing params

If the image.bbclass is called with arguments, and these arguments are not
"populate_sdk", they will be passed in as the expected GLOBS.

This enables external components and scripting to use the
rootfs_install_complementary code.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 9af67e7384..ab212b3f0b 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -329,8 +329,10 @@ rootfs_install_complementary() {
     list_installed_packages arch > ${WORKDIR}/installed_pkgs.txt
 
     # Apply the globs to all the packages currently installed
-    if [ "$1" = "populate_sdk" ] ; then
+    if [ -n "$1" -a "$1" = "populate_sdk" ] ; then
         GLOBS="${SDKIMAGE_INSTALL_COMPLEMENTARY}"
+    elif [ -n "$1" ]; then
+        GLOBS="$@"
     else
         GLOBS="${IMAGE_INSTALL_COMPLEMENTARY}"
         # Add locales