From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 26 Mar 2014 11:40:50 +0000 (+0000)
Subject: package_manager: Fix apt-ftparchive index creation problems
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34071
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3965b76ed4361455c89c982761263be03e1a8e5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 692528db166..824af00f545 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