UBUNTU: [Packaging] use default zstd compression

Revert "UBUNTU: [Packaging] enforce xz compression for debs"

This reverts commit 45da4d72dea537910d970211ff8c345f4f9a2775.

The previous commit incorrectly stated that jammy dpkg default has
switched from xz to zstd. This change was done late in impish
cycle. [1] It also incorrectly states that there are no evident benefits
for the kernel packages to use zstd.

It is correct that zstd compression may require more
resources. However, the decompression speed and decompression memory
requirements are a lot faster. The choice to switch from xz to zstd by
default in Ubuntu was done to speed up installation and upgrade of all
packages, at the expense of slightly larger download sizes.

If we do want to futher optimize compression methods it should
probably be done on per subpackage type. For example, linux-image-ABI
already contains compressed kernel image and not much else, we can
choose to not compress that deb at all with compression method
none. Debug symbols are usually rarely installed, thus it might make
sense to keep them small and thus choose compress ddebs with
xz. However modules and tools should remain compressed with zstd.

[1] https://launchpad.net/ubuntu/+source/dpkg/1.20.9ubuntu2

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 74c4ab9897db532613916ad9ea1eb4a93b0f12cb..70d1458c52cf771da0e314304159a215b6069176 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -565,7 +565,7 @@ define dh_all
        dh_installdebconf -p$(1)
        $(lockme) dh_gencontrol -p$(1) -- -Vlinux:rprovides='$(rprovides)'
        dh_md5sums -p$(1)
-       dh_builddeb -p$(1) -- -Zxz
+       dh_builddeb -p$(1)
 endef
 define newline
 

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 0868ce04dfc3205900a5b43e8c8bfa48e4559106..95ad7056459bb9dce10c2e633a581fbd16ae463e 100644 (file)
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -191,7 +191,7 @@ binary-headers: $(stampdir)/stamp-prepare-indep $(stampdir)/stamp-install-header
        dh_installdeb -p$(indep_hdrpkg)
        $(lockme) dh_gencontrol -p$(indep_hdrpkg)
        dh_md5sums -p$(indep_hdrpkg)
-       dh_builddeb -p$(indep_hdrpkg) -- -Zxz
+       dh_builddeb -p$(indep_hdrpkg)
 
 binary-indep: cloudpkg = $(cloud_common_pkg_name)
 binary-indep: hosttoolspkg = $(hosttools_pkg_name)
@@ -229,4 +229,4 @@ endif
        dh_installdeb -i
        $(lockme) dh_gencontrol -i
        dh_md5sums -i
-       dh_builddeb -i -- -Zxz
+       dh_builddeb -i