summaryrefslogtreecommitdiffstats
path: root/meta/lib
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
parentda097095c6f1bd1785ed770b45be45e458b97d8e (diff)
downloadpoky-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')
-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):
192 if not os.path.isdir(arch_dir): 192 if not os.path.isdir(arch_dir):
193 continue 193 continue
194 194
195 index_cmds.append("cd %s; PSEUDO_UNLOAD=1 %s packages > Packages" % 195 cmd = "cd %s; PSEUDO_UNLOAD=1 %s packages . > Packages;" % (arch_dir, apt_ftparchive)
196 (arch_dir, apt_ftparchive))
197 196
198 index_cmds.append("cd %s; %s Packages -c > Packages.gz" % 197 cmd += "%s -fc Packages > Packages.gz;" % gzip
199 (arch_dir, gzip))
200 198
201 with open(os.path.join(arch_dir, "Release"), "w+") as release: 199 with open(os.path.join(arch_dir, "Release"), "w+") as release:
202 release.write("Label: %s" % arch) 200 release.write("Label: %s\n" % arch)
203 201
204 index_cmds.append("cd %s; PSEUDO_UNLOAD=1 %s release >> Release" % 202 cmd += "PSEUDO_UNLOAD=1 %s release . >> Release" % apt_ftparchive
205 (arch_dir, apt_ftparchive)) 203
204 index_cmds.append(cmd)
206 205
207 deb_dirs_found = True 206 deb_dirs_found = True
208 207