Skip to content

Commit a4e0a0b

Browse files
rmacnak-googleCommit Queue
authored andcommitted
[build] Pass -Zxz to dh_builddeb instead of dpkg-buildpackage.
Passing to the later only affects source packages. Bug: #26953 Change-Id: I3ca94c3ddbed4493536d3db52df6ec92c2e72bbf Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431302 Reviewed-by: Brian Quinlan <[email protected]> Commit-Queue: Ryan Macnak <[email protected]>
1 parent 323b247 commit a4e0a0b

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

tools/debian_package/create_debian_package.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ def Main():
5959
GenerateCopyright(join(versiondir, 'debian', 'copyright'))
6060
GenerateChangeLog(join(versiondir, 'debian', 'changelog'), version)
6161

62-
# Explicitly choose xz compression because newer versions dpkg-buildpackage
63-
# (on our bots) default to zstd, which is not supported by older versions
64-
# of dpkg (on users machines).
65-
cmd = ['dpkg-buildpackage', '-B', '-a', options.arch, '-us', '-uc', '-Zxz']
62+
cmd = ['dpkg-buildpackage', '-B', '-a', options.arch, '-us', '-uc']
6663
env = os.environ.copy()
6764
env["LIB_DIR"] = options.lib_dir
6865
process = subprocess.check_call(cmd, cwd=versiondir, env=env)

tools/debian_package/debian/rules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ override_dh_auto_build:
1616
# Nop
1717
override_dh_auto_test:
1818

19+
# Explicitly choose xz compression because newer versions dpkg-buildpackage
20+
# (on our bots) default to zstd, which is not supported by older versions
21+
# of dpkg (on users machines).
22+
override_dh_builddeb:
23+
dh_builddeb -- -Zxz
24+
1925
# Nop
2026
override_dh_strip:
2127

0 commit comments

Comments
 (0)