[X2Go-Commits] [buildscripts] 01/01: bin/sbuild-deb-package: use apt-get as dependency resolver on stretch and up.

git-admin at x2go.org git-admin at x2go.org
Mon Aug 21 23:28:28 CEST 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 75cc124d43e6d1eec570815c34a846afd9d253a9
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Aug 21 23:28:05 2017 +0200

    bin/sbuild-deb-package: use apt-get as dependency resolver on stretch and up.
    
    Trying to avoid segfaulting aptitude on arm*-based stretch chroots.
---
 bin/sbuild-deb-package | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index c60da80..6a31f6b 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -327,7 +327,16 @@ build_packages() {
 				git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog
 
 				typeset -a sbuild_options
-				sbuild_options=("-n" "--jobs=2" "-sA" "--dist=${codename}" "--keyid=${GPG_KEY}" "--build-dep-resolver=aptitude")
+				sbuild_options=("-n" "--jobs=2" "-sA" "--dist=${codename}" "--keyid=${GPG_KEY}")
+
+				if [ "${numerical_version}" -gt "8" ]; then
+					# Stretch and up recommend to use apt-get as the preferred management tool.
+					# Additionally, at the time of writing this comment, aptitude segfaults on
+					# arm*- and stretch-based chroots with Qemu user emulation.
+					sbuild_options+=("--build-dep-resolver=apt")
+				else
+					sbuild_options+=("--build-dep-resolver=aptitude")
+				fi
 
 				if [ -n "${SA_OPTION}" ]; then
 					sbuild_options+=("${SA_OPTION}")

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list