]> 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>
Thu, 2 Jul 2020 10:18:38 +0000 (12:18 +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 790b26aef2caf2f84e645566ef5d6f2ee1cde8a3..398a75f7e3cff51c00b911f5aa948191d15b0678 100644 (file)
@@ -320,5 +320,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 2b93796a764384a8ec76362b3714c755da5dde2c..ca55870fc1c39f70112f5c8244ba4d0dc905821b 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_package_qa"
 do_rootfs[vardeps] += "PACKAGE_FEED_URIS"
 
index 58c73d645d6f1e4abdc04393991c8d6e70ebde55..367490fc5bfce1b469a59316144590f026d61de1 100644 (file)
@@ -282,6 +282,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
@@ -293,6 +294,7 @@ class DpkgIndexer(Indexer):
             cmd = "cd %s; PSEUDO_UNLOAD=1 %s packages . > Packages;" % (arch_dir, apt_ftparchive)
 
             cmd += "%s -fcn 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)