summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDavid Nyström <david.c.nystrom@gmail.com>2014-02-11 16:00:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-11 17:15:54 +0000
commitf60f802a0faa9f06cf6885c8811b02eef8388af8 (patch)
treef031a998c5724987fc02fabd8f0ba8af120e5268 /meta
parent9c61b6392c991363b0399ed36d6dec3f0d0d6bcf (diff)
downloadpoky-f60f802a0faa9f06cf6885c8811b02eef8388af8.tar.gz
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. (From OE-Core rev: d926c0bdc58ab6dda55eed52b66dbd5834ced64f) Signed-off-by: David Nyström <david.nystrom@enea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/license.bbclass5
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() {
26} 26}
27 27
28license_create_manifest() { 28license_create_manifest() {
29 # Test if BUILD_IMAGES_FROM_FEEDS is defined in env
30 if [ -n "${BUILD_IMAGES_FROM_FEEDS}" ]; then
31 exit 0
32 fi
33
29 INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest` 34 INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`
30 LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest" 35 LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest"
31 # remove existing license.manifest file 36 # remove existing license.manifest file