From fa492c89901406aedc20e2d5c709a1d5b5521d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Sun, 1 Nov 2015 15:30:04 +0000 Subject: [PATCH] build fixes --- resolve-debbuilddeps.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh index 4c91230..6ceef6b 100755 --- a/resolve-debbuilddeps.sh +++ b/resolve-debbuilddeps.sh @@ -15,15 +15,10 @@ SCHROOTNAME="$1" sed 's,@[^@]*@, dummytext,g' debian/control.in > debian/control if test -n "${SCHROOTNAME}"; then - schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get install -y dpkg-dev software-properties-common - schroot -c "${SCHROOTNAME}" -u root -d / -- apt-add-repository universe || true - schroot -c "${SCHROOTNAME}" -u root -d / -- apt-add-repository multiverse || true - schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get update + schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get install -y dpkg-dev DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true) else - sudo apt-get install -y dpkg-dev software-properties-common - sudo apt-add-repository universe || true - sudo apt-add-repository multiverse || true + sudo apt-get install -y dpkg-dev sudo apt-get update DEPS=$(dpkg-checkbuilddeps 2>&1 || true) fi