summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2014-09-03 00:38:18 +0200
committerAndreas Oberritter <obi@opendreambox.org>2020-07-02 12:18:38 +0200
commit25a0ffd560181d6521db63d6cb205f57bcb4e115 (patch)
tree7a68e44c8408815dea60d4d7afd0b70034e181e3
parent5272449a62b51ac63705ded0a0c6ae889bec62a0 (diff)
downloadopenembedded-core-contrib-25a0ffd560181d6521db63d6cb205f57bcb4e115.tar.gz
package_manager/deb: create Packages.xz
apt-get prefers it over Packages.gz. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta/classes/package_deb.bbclass1
-rw-r--r--meta/classes/rootfs_deb.bbclass4
-rw-r--r--meta/lib/oe/package_manager.py2
3 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 790b26aef2..398a75f7e3 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -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"
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 2b93796a76..ca55870fc1 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -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"
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 58c73d645d..367490fc5b 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -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)