diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2012-09-07 17:05:43 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 14:44:51 +0100 |
| commit | f44c5f227a170290f567d0a0a24baaa870048788 (patch) | |
| tree | df6f96ff51580ed23d9d093c0c3edd17cf8be89b /meta/classes/image.bbclass | |
| parent | d4f4a57b8d564d57256017d937ed2eabf94c36ae (diff) | |
| download | openembedded-core-contrib-f44c5f227a170290f567d0a0a24baaa870048788.tar.gz | |
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>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | 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 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 |