summaryrefslogtreecommitdiffstats
path: root/scripts
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:30 +0100
commitad63b9b11b4c42414ff2c180dd03c1a7283321ec (patch)
tree63536789ab45d23d3288cd82ef87cc08490055b1 /scripts
parent74aac73d69985ebc41a18fd30111e3c9c82f434f (diff)
downloadpoky-ad63b9b11b4c42414ff2c180dd03c1a7283321ec.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). (From OE-Core rev: 4a85d8a4026cf1d1603513ed9780f80c603cc611) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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):
112 fwdfile = fwdpkgdata(mappedpkg) 112 fwdfile = fwdpkgdata(mappedpkg)
113 if os.path.exists(fwdfile): 113 if os.path.exists(fwdfile):
114 mappedpkg = readrenamed(fwdfile) 114 mappedpkg = readrenamed(fwdfile)
115 if not os.path.exists(fwdfile + ".packaged"):
116 mappedpkg = ""
115 else: 117 else:
116 # That didn't work, so now get the PN, substitute that, then map in the other direction 118 # That didn't work, so now get the PN, substitute that, then map in the other direction
117 revlink = revpkgdata(pkg) 119 revlink = revpkgdata(pkg)
@@ -121,6 +123,8 @@ def glob(args):
121 fwdfile = fwdpkgdata(newpkg) 123 fwdfile = fwdpkgdata(newpkg)
122 if os.path.exists(fwdfile): 124 if os.path.exists(fwdfile):
123 mappedpkg = readrenamed(fwdfile) 125 mappedpkg = readrenamed(fwdfile)
126 if not os.path.exists(fwdfile + ".packaged"):
127 mappedpkg = ""
124 else: 128 else:
125 # Package doesn't even exist... 129 # Package doesn't even exist...
126 if debug: 130 if debug: