diff options
| author |   Randy Witt <randy.e.witt@linux.intel.com> | 2016-02-18 09:17:53 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-21 09:31:58 +0000 |
| commit | 5b7bc7ab44c2cc5d5f217d9ad81a210ea053dc85 (patch) | |
| tree | efed2f09bbd337e3ac6696b28a357524d21b5994 | |
| parent | 84065e9b33e6d401e4e50436665838be2d0267ad (diff) | |
| download | openembedded-core-contrib-5b7bc7ab44c2cc5d5f217d9ad81a210ea053dc85.tar.gz | |
populate_sdk_ext: Don't ignore SDK_TARGETS value
This fixes a problem where SDK_INSTALL_TARGETS wouldn't pick up the
value in SDK_TARGETS. It also removes the inline python to make the
code more readable.
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 6e3664257d..7c953010d5 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -32,7 +32,18 @@ SDK_INHERIT_BLACKLIST ?= "buildhistory icecc" SDK_UPDATE_URL ?= "" SDK_TARGETS ?= "${PN}" -SDK_INSTALL_TARGETS = "${@SDK_TARGETS if d.getVar('SDK_EXT_TYPE', True) != 'minimal' else ''} ${@'meta-world-pkgdata:do_allpackagedata' if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1' else ''}" + +def get_sdk_install_targets(d): + sdk_install_targets = '' + if d.getVar('SDK_EXT_TYPE', True) != 'minimal': + sdk_install_targets = d.getVar('SDK_TARGETS', True) + + if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1': + sdk_install_targets += ' meta-world-pkgdata:do_allpackagedata' + + return sdk_install_targets + +SDK_INSTALL_TARGETS = "${@get_sdk_install_targets(d)}" OE_INIT_ENV_SCRIPT ?= "oe-init-build-env" # The files from COREBASE that you want preserved in the COREBASE copied |