Patchwork license.bbclass: Dont create a manifest when using BUILD_IMAGES_FROM_FEEDS

login
register
mail settings
Submitter David Nyström
Date Feb. 11, 2014, 3 p.m.
Message ID <1392130805-20371-1-git-send-email-david.nystrom@enea.com>
Download mbox | patch
Permalink /patch/66585/
State Accepted
Commit f60f802a0faa9f06cf6885c8811b02eef8388af8
Headers show

Comments

David Nyström - Feb. 11, 2014, 3 p.m.
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>
---
 meta/classes/license.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

Patch

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