Patchwork [1/2] image.bbclass: Enable the complementary install to be called w/ globbing params

login
register
mail settings
Submitter Mark Hatle
Date Sept. 7, 2012, 10:05 p.m.
Message ID <cace43d80670231e0f389f8e8920d534f53c4606.1347055413.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/36143/
State Accepted
Commit f44c5f227a170290f567d0a0a24baaa870048788
Headers show

Comments

Mark Hatle - Sept. 7, 2012, 10:05 p.m.
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>
---
 meta/classes/image.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2e95556..9433d48 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