From 384416c74c85b0b4acf3a4f16be58b54e29f3be4 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 30 Jul 2012 09:52:01 +0100 Subject: [PATCH] scripts/oe-pkgdata-util: exclude unpackaged in glob output Check for .packaged file and exclude packages if this file does not exist - this avoids attempting to install empty packages during complementary package installation within do_rootfs that didn't end up being created (and failing as a result). (From OE-Core rev: 4a85d8a4026cf1d1603513ed9780f80c603cc611) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/oe-pkgdata-util | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util index 2427f10..900c27a 100755 --- a/scripts/oe-pkgdata-util +++ b/scripts/oe-pkgdata-util @@ -112,6 +112,8 @@ def glob(args): fwdfile = fwdpkgdata(mappedpkg) if os.path.exists(fwdfile): mappedpkg = readrenamed(fwdfile) + if not os.path.exists(fwdfile + ".packaged"): + mappedpkg = "" else: # That didn't work, so now get the PN, substitute that, then map in the other direction revlink = revpkgdata(pkg) @@ -121,6 +123,8 @@ def glob(args): fwdfile = fwdpkgdata(newpkg) if os.path.exists(fwdfile): mappedpkg = readrenamed(fwdfile) + if not os.path.exists(fwdfile + ".packaged"): + mappedpkg = "" else: # Package doesn't even exist... if debug: -- 2.7.4