]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
package_manager/deb: create Packages.xz
authorAndreas Oberritter <obi@opendreambox.org>
Tue, 2 Sep 2014 22:38:18 +0000 (00:38 +0200)
committerAndreas Oberritter <obi@opendreambox.org>
Mon, 7 May 2018 21:25:22 +0000 (23:25 +0200)
apt-get prefers it over Packages.gz.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
meta/classes/package_deb.bbclass
meta/classes/rootfs_deb.bbclass
meta/lib/oe/package_manager.py

index eacabcdb61a0054957a08ae6691a6b0b5b917326..7475643e4e5e8e554b149feed002c6232120cff2 100644 (file)
@@ -335,5 +335,6 @@ addtask package_write_deb after do_packagedata do_package
 
 PACKAGEINDEXDEPS += "dpkg-native:do_populate_sysroot"
 PACKAGEINDEXDEPS += "apt-native:do_populate_sysroot"
+PACKAGEINDEXDEPS += "xz-native:do_populate_sysroot"
 
 do_build[recrdeptask] += "do_package_write_deb"
index 262e3d555be093b8a867bad70e799f61ce2d655b..99843d6be6cec487c1638b89f25ac36f93c7bd24 100644 (file)
@@ -4,8 +4,8 @@
 
 ROOTFS_PKGMANAGE = "dpkg apt"
 
-do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot"
-do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
+do_rootfs[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot xz-native:do_populate_sysroot"
+do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot xz-native:do_populate_sysroot"
 do_rootfs[recrdeptask] += "do_package_write_deb"
 do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
 
index e95835a2db245b7bfee7a6832ba9e536c9290adb..f792476fc200c6caacba6d3534c7b9838a3b62d8 100644 (file)
@@ -210,6 +210,7 @@ class DpkgIndexer(Indexer):
 
         apt_ftparchive = bb.utils.which(os.getenv('PATH'), "apt-ftparchive")
         gzip = bb.utils.which(os.getenv('PATH'), "gzip")
+        xz = bb.utils.which(os.getenv('PATH'), "xz")
 
         index_cmds = []
         deb_dirs_found = False
@@ -221,6 +222,7 @@ class DpkgIndexer(Indexer):
             cmd = "cd %s; PSEUDO_UNLOAD=1 %s packages . > Packages;" % (arch_dir, apt_ftparchive)
 
             cmd += "%s -fc Packages > Packages.gz;" % gzip
+            cmd += "%s -fc Packages > Packages.xz;" % xz
 
             with open(os.path.join(arch_dir, "Release"), "w+") as release:
                 release.write("Label: %s\n" % arch)