diff options
| author | David Nyström <david.c.nystrom@gmail.com> | 2014-02-11 16:00:05 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 17:13:23 +0000 |
| commit | d926c0bdc58ab6dda55eed52b66dbd5834ced64f (patch) | |
| tree | 30506a20509a5e99f5ddcce6355063df77d2906b /meta/classes | |
| parent | f35bbba65e3e41f8dea1f9ff872d3a9fbd84bf6d (diff) | |
| download | openembedded-core-d926c0bdc58ab6dda55eed52b66dbd5834ced64f.tar.gz openembedded-core-d926c0bdc58ab6dda55eed52b66dbd5834ced64f.tar.bz2 openembedded-core-d926c0bdc58ab6dda55eed52b66dbd5834ced64f.zip | |
license.bbclass: Dont create a manifest when using BUILD_IMAGES_FROM_FEEDS
Wihtout this patch, FEEDS functionality is broken, and creating
a manifest from recipe metadata may be faulty when using FEEDS.
Signed-off-by: David Nyström <david.nystrom@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/license.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index c668783742..a0b877d341 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -26,6 +26,11 @@ python write_package_manifest() { } license_create_manifest() { + # Test if BUILD_IMAGES_FROM_FEEDS is defined in env + if [ -n "${BUILD_IMAGES_FROM_FEEDS}" ]; then + exit 0 + fi + INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest` LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest" # remove existing license.manifest file |