From: David Nyström <david.c.nystrom@gmail.com>
Date: Tue, 11 Feb 2014 15:00:05 +0000 (+0100)
Subject: license.bbclass: Dont create a manifest when using BUILD_IMAGES_FROM_FEEDS
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34522
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d926c0bdc58ab6dda55eed52b66dbd5834ced64f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index c668783742a..a0b877d341f 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