[oe-commits] =?UTF-8?Q?David=20Nystr=C3=B6m=20?=: license.bbclass: Dont create a manifest when using BUILD_IMAGES_FROM_FEEDS

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: d926c0bdc58ab6dda55eed52b66dbd5834ced64f
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d926c0bdc58ab6dda55eed52b66dbd5834ced64f

Author: David Nyström <david.c.nystrom at gmail.com>
Date:   Tue Feb 11 16:00:05 2014 +0100

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 at enea.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/license.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

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