aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/oe-pkgdata-util
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-07-30 09:52:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-31 12:21:21 +0100
commit4a85d8a4026cf1d1603513ed9780f80c603cc611 (patch)
treec431517bc7d704364d81f2b7f280bc53327bb909 /scripts/oe-pkgdata-util
parentde339b0cb201035e27df1128ccf526937b8325ec (diff)
downloadopenembedded-core-contrib-4a85d8a4026cf1d1603513ed9780f80c603cc611.tar.gz
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). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-pkgdata-util')
-rwxr-xr-xscripts/oe-pkgdata-util4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 2427f10d89..900c27af68 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: