This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 1d0a52148d39f59e843959002e8e11e8cd4bb0a1 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 14 06:10:02 2016 +0100 bin/sbuild-deb-package: simplify ${SBUILD_OPTIONS} and friends generation. This commit introduces a multitude of changes: - drop the explicit chroot setting - inferring by sbuild will be good enough for now (given we don't need multiple project chroots.) - use --jobs=auto instead of -j2. We might overcommit the machine, but that's probably fine. - move OTHERMIRROR handling to one place instead of twice in the actual building sections. - unify ${SBUILD_OPTIONS} and arch-dependent ${SBUILD_OPTIONS} magic. - use the checked out git sources in ${PROJECT_DIR} instead of a DSC file. --- bin/sbuild-deb-package | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index e83c50c..8aa113f 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -313,28 +313,26 @@ build_packages() { # create git changelog immediately prior to building the package git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog - SBUILD_OPTIONS="-n -j2 -sAd ${codename} -k ${GPG_KEY} --build-dep-resolver=aptitude" - SBUILD_OPTIONS_64="${SBUILD_OPTIONS} -c arctica-${l_CODENAME}" - SBUILD_OPTIONS_32="${SBUILD_OPTIONS} -c arctica-${l_CODENAME}-i386 --arch=i386 --debbuildopts=-B" + SBUILD_OPTIONS="-n --jobs=auto -sAd ${codename} -k ${GPG_KEY} --build-dep-resolver=aptitude" + if [ -n "${SA_OPTION}" ]; then - SBUILD_OPTIONS_64=${SBUILD_OPTIONS}" ${SA_OPTION}" + SBUILD_OPTIONS="${SBUILD_OPTIONS} ${SA_OPTION}" + fi + + if [ -n "${OTHERMIRROR}" ]; then + SBUILD_OPTIONS="${SBUILD_OPTIONS} --extra-repository=\"${OTHERMIRROR}\"" fi + SBUILD_OPTIONS_64="${SBUILD_OPTIONS}" + SBUILD_OPTIONS_32="${SBUILD_OPTIONS} --arch=i386 --debbuildopts=\"-B\"" + [ "x${SKIP_ARCH}" != "xamd64" ] && grep -Eqs 'Architecture.*(all|any|amd64)' "${TEMP_DIR}/${PROJECT}/debian/control" && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/amd64" - if [ -z "${OTHERMIRROR}" ]; then - nice ${SBUILD} ${SBUILD_OPTIONS_64} "${DSCFILE}" - else - nice ${SBUILD} ${SBUILD_OPTIONS_64} --extra-repository="${OTHERMIRROR}" "${DSCFILE}" - fi + nice ${SBUILD} ${SBUILD_OPTIONS_64} "${PROJECT_DIR}" } [ "x${SKIP_ARCH}" != "xi386" ] && grep -Eqs 'Architecture.*(any|i386)' "${TEMP_DIR}/${PROJECT}/debian/control" && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386" - if [ -z "${OTHERMIRROR}" ]; then - nice ${SBUILD} ${SBUILD_OPTIONS_32} "${DSCFILE}" - else - nice ${SBUILD} ${SBUILD_OPTIONS_32} --extra-repository="${OTHERMIRROR}" "${DSCFILE}" - fi + nice ${SBUILD} ${SBUILD_OPTIONS_32} "${PROJECT_DIR}" } done } -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git