From ef12290da9742855bfd370e806a00a4987a48567 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 26 Oct 2017 14:17:49 +0800 Subject: staging.bbclass: print searched manifest when not found The old warning was: WARNING: lib32-wrlinux-image-glibc-small-1.0-r1 do_prepare_recipe_sysroot: Manifest /path/to/tmp/sstate-control/manifest-allarch-lib32-qemuwrapper-cross.populate_sysroot not found? The message wasn't clear enough, it searched a few manifests, but only reported the last one, which confused user. Now the warning is: WARNING: lib32-wrlinux-image-glibc-small-1.0-r1 do_rootfs: Manifest for lib32-qemuwrapper-cross not found, searched manifests: /path/to/tmp/sstate-control/manifest-qemux86_64-lib32-qemuwrapper-cross.populate_sysroot /path/to/tmp/sstate-control/manifest-core2-64-lib32-qemuwrapper-cross.populate_sysroot /path/to/tmp/sstate-control/manifest-x86_64-lib32-qemuwrapper-cross.populate_sysroot /path/to/tmp/sstate-control/manifest-allarch-lib32-qemuwrapper-cross.populate_sysroot Whick makes debug easier. Signed-off-by: Robert Yang --- meta/classes/staging.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 455eb056f0..75bec84127 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -504,6 +504,7 @@ python extend_recipe_sysroot() { variant = '' native = False + searched_manifest = [] if c.endswith("-native"): manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c) native = True @@ -523,8 +524,11 @@ python extend_recipe_sysroot() { manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-%s-%s.populate_sysroot" % (pkgarch, c)) if os.path.exists(manifest): break + searched_manifest.append(manifest) if not os.path.exists(manifest): - bb.warn("Manifest %s not found?" % manifest) + if not searched_manifest: + searched_manifest.append(manifest) + bb.warn("Manifest for %s not found, searched manifests:\n%s" % (c, '\n'.join(searched_manifest))) else: newmanifest = collections.OrderedDict() if native: -- cgit 1.2.3-korg