aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-26 11:40:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-27 09:42:06 +0000
commitb503d35e7e56dc66447eb2bc83e3277862d328b9 (patch)
tree27fe6e36ee7ad80ad7cf56ff02b0a55b404504d5 /meta/lib/oe
parentda097095c6f1bd1785ed770b45be45e458b97d8e (diff)
downloadopenembedded-core-contrib-b503d35e7e56dc66447eb2bc83e3277862d328b9.tar.gz
package_manager: Fix apt-ftparchive index creation problems
a) There were missing parameters to the release and package commands (".") b) The commands need to be executed as one block since they build upon each other (From OE-Core rev: a3965b76ed4361455c89c982761263be03e1a8e5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 692528db16..824af00f54 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -192,17 +192,16 @@ class DpkgIndexer(Indexer):
if not os.path.isdir(arch_dir):
continue
- index_cmds.append("cd %s; PSEUDO_UNLOAD=1 %s packages > Packages" %
- (arch_dir, apt_ftparchive))
+ cmd = "cd %s; PSEUDO_UNLOAD=1 %s packages . > Packages;" % (arch_dir, apt_ftparchive)
- index_cmds.append("cd %s; %s Packages -c > Packages.gz" %
- (arch_dir, gzip))
+ cmd += "%s -fc Packages > Packages.gz;" % gzip
with open(os.path.join(arch_dir, "Release"), "w+") as release:
- release.write("Label: %s" % arch)
+ release.write("Label: %s\n" % arch)
- index_cmds.append("cd %s; PSEUDO_UNLOAD=1 %s release >> Release" %
- (arch_dir, apt_ftparchive))
+ cmd += "PSEUDO_UNLOAD=1 %s release . >> Release" % apt_ftparchive
+
+ index_cmds.append(cmd)
deb_dirs_found = True