[oe-commits] Mark Hatle : image.bbclass: Enable the complementary install to be called w / globbing params

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: f44c5f227a170290f567d0a0a24baaa870048788
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f44c5f227a170290f567d0a0a24baaa870048788

Author: Mark Hatle <mark.hatle at windriver.com>
Date:   Fri Sep  7 17:05:43 2012 -0500

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 at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/image.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 9af67e7..ab212b3 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