From d926c0bdc58ab6dda55eed52b66dbd5834ced64f Mon Sep 17 00:00:00 2001 From: David Nyström Date: Tue, 11 Feb 2014 16:00:05 +0100 Subject: license.bbclass: Dont create a manifest when using BUILD_IMAGES_FROM_FEEDS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 5 +++++ 1 file changed, 5 insertions(+) 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 -- cgit 1.2.3-korg