From 155255847323c126c63e22d8fa5ae98586a7f9d5 Mon Sep 17 00:00:00 2001 From: Keerthi Gowda Date: Tue, 21 Jul 2026 07:52:16 -0700 Subject: [PATCH] docker_deb_build: multiple build-deps using aptitude resolver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allow for alternate build-dependencies e.g.: Build-Depends: new-name | old-name by using the non-defaut aptitude sbuild resolver. Signed-off-by: Loïc Minier Signed-off-by: Keerthi Gowda --- docker_deb_build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker_deb_build.py b/docker_deb_build.py index 7ccfb13..586bad7 100755 --- a/docker_deb_build.py +++ b/docker_deb_build.py @@ -398,7 +398,8 @@ def build_package_in_docker(image_name: str, source_dir: str, output_dir: str, d lintian_option = '--no-run-lintian' if not run_lintian else "" # --no-clean-source: skip dpkg-buildpackage --clean on host (avoids build-dep check outside chroot) # --chroot-mode=unshare: force using the mmdebstrap tarball chroot path for all supported suites. - sbuild_cmd = f"sbuild --chroot-mode=unshare --no-clean-source --build-dir=/workspace/output --host=arm64 --build=arm64 --dist={distro} {lintian_option} {extra_repo_option} {extra_package_option}" + # --build-dep-resolver=aptitude: use non-default resolver that will accept alternate build-dependencies (Build-Depends: new-name | old-name) + sbuild_cmd = f"sbuild --chroot-mode=unshare --build-dep-resolver=aptitude --no-clean-source --build-dir=/workspace/output --host=arm64 --build=arm64 --dist={distro} {lintian_option} {extra_repo_option} {extra_package_option}" # Ensure git inside the container treats the mounted checkout as safe git_safe_cmd = "git config --global --add safe.directory /workspace/src"