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 15:13:35 +0100 |
commit | a6359e9710c562bb7c6f885aa866121b7524c6c8 (patch) | |
tree | 8dd28e77a58900d7a8553c11c76b9a78847379fb /meta/classes/image.bbclass | |
parent | 5a71f258258d4cfa6730b45f58bfe44888903683 (diff) | |
download | poky-a6359e9710c562bb7c6f885aa866121b7524c6c8.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.
(From OE-Core rev: f44c5f227a170290f567d0a0a24baaa870048788)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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() { | |||
329 | list_installed_packages arch > ${WORKDIR}/installed_pkgs.txt | 329 | list_installed_packages arch > ${WORKDIR}/installed_pkgs.txt |
330 | 330 | ||
331 | # Apply the globs to all the packages currently installed | 331 | # Apply the globs to all the packages currently installed |
332 | if [ "$1" = "populate_sdk" ] ; then | 332 | if [ -n "$1" -a "$1" = "populate_sdk" ] ; then |
333 | GLOBS="${SDKIMAGE_INSTALL_COMPLEMENTARY}" | 333 | GLOBS="${SDKIMAGE_INSTALL_COMPLEMENTARY}" |
334 | elif [ -n "$1" ]; then | ||
335 | GLOBS="$@" | ||
334 | else | 336 | else |
335 | GLOBS="${IMAGE_INSTALL_COMPLEMENTARY}" | 337 | GLOBS="${IMAGE_INSTALL_COMPLEMENTARY}" |
336 | # Add locales | 338 | # Add locales |