From 5b5111201aa4636bf8c56dc6fcf3083f71bd4387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Tue, 3 Nov 2015 10:41:19 +0000 Subject: [PATCH] prepared for build in a docker instance on jenkins --- debian/control.in | 2 +- resolve-debbuilddeps.sh | 42 ++++++++++++++++++++--------------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/debian/control.in b/debian/control.in index 4290af2..c3ba895 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,7 @@ Source: @PACKAGE_NAME@ Priority: extra Maintainer: @AUTHOR@ -Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, libcppunit-dev, libz-dev, libiberty-dev | binutils-dev, binutils-dev +Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, libcppunit-dev, libz-dev, libiberty-dev | libiberty, binutils-dev Package: @PACKAGE_NAME@ Section: libs diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh index 89f24ba..7297f60 100755 --- a/resolve-debbuilddeps.sh +++ b/resolve-debbuilddeps.sh @@ -12,14 +12,28 @@ SCHROOTNAME="$1" +function install() { + if test -n "${SCHROOTNAME}"; then + if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install $*; then + return 0 + fi + else + if apt-get -y install $*; then + return 0 + fi + fi +} + if test -e debian/control.in -a ! -e debian/control; then sed 's,@[^@]*@, dummytext,g' debian/control.in > debian/control trap "rm debian/control" INT TERM EXIT fi if test -n "${SCHROOTNAME}"; then + schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install dpkg-dev DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true) else + apt-get -y install dpkg-dev DEPS=$(dpkg-checkbuilddeps 2>&1 || true) fi DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') @@ -32,16 +46,10 @@ for pa in ${DEPS}; do fi success=0 for p in ${pa//|/ }; do - if test -n "${SCHROOTNAME}"; then - if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install ${p}; then - success=1 - break; - fi - else - if apt-get -y install ${p}; then - success=1 - break; - fi + if install ${TO_INSTALL} ${p}; then + TO_INSTALL+=" ${p}" + success=1 + break fi done if test ${success} -eq 0; then @@ -50,18 +58,8 @@ for pa in ${DEPS}; do fi done -success=0 -if test -n "${SCHROOTNAME}"; then - if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install ${TO_INSTALL}; then - success=1 - fi -else - if apt-get -y install ${TO_INSTALL}; then - success=1 - fi -fi -if test ${success} -eq 0; then - echo "**** Error: Installation Failed: ${pa}" +if test -n "${TO_INSTALL}" && ! install ${TO_INSTALL}; then + echo "**** Error: Installation Failed: ${TO_INSTALL}" exit 1 fi