This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from c70ad4f bin/sbuild-deb-package: backport from bin/build-deb-package: re-add othermirror workaround for x2gomatemabindings on wheezy. new c7b985a bin/build-deb-package: use lower-case codename version when working with OTHERMIRROR. new 9160862 bin/sbuild-deb-package: backport from bin/build-deb-package: use lower-case codename version when working with OTHERMIRROR. new 7cb2beb bin/sbuild-deb-package: fix package uploads: in X2Go context, we upload files to the ${PREFIX}-${DIST}-${DIST_CODENAME} location, not ${PREFIX}-${DIST}-${RELEASE_NAME} location. new ccb2d3a bin/sbuild-deb-package: don't build a source package manually. new 1d0a521 bin/sbuild-deb-package: simplify ${SBUILD_OPTIONS} and friends generation. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/build-deb-package | 4 ++-- bin/sbuild-deb-package | 47 ++++++++++++++--------------------------------- 2 files changed, 16 insertions(+), 35 deletions(-) -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit c7b985aaf301e5b2dc60ae46114da30e7ed5d194 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 14 05:51:26 2016 +0100 bin/build-deb-package: use lower-case codename version when working with OTHERMIRROR. --- bin/build-deb-package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/build-deb-package b/bin/build-deb-package index c7dcea2..6517d4d 100755 --- a/bin/build-deb-package +++ b/bin/build-deb-package @@ -317,8 +317,8 @@ build_packages() { else grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT}" fi - if [ "${PROJECT}" = "x2gomatebindings" ] && [ "${l_CODENAME}" = "wheezy" ]; then - OTHERMIRROR="deb http://http.debian.net/debian ${l_CODENAME}-backports main" + if [ "${PROJECT}" = "x2gomatebindings" ] && [ "${codename}" = "wheezy" ]; then + OTHERMIRROR="deb http://http.debian.net/debian ${codename}-backports main" fi # create git changelog immediately prior to building the package -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 91608624962641c0a3e61e5cf7b64087e8d6f72a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 14 05:51:55 2016 +0100 bin/sbuild-deb-package: backport from bin/build-deb-package: use lower-case codename version when working with OTHERMIRROR. --- bin/sbuild-deb-package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 898d581..7f5af51 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -306,8 +306,8 @@ build_packages() { else grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT}" fi - if [ "${PROJECT}" = "x2gomatebindings" ] && [ "${l_CODENAME}" = "wheezy" ]; then - OTHERMIRROR="deb http://http.debian.net/debian ${l_CODENAME}-backports main" + if [ "${PROJECT}" = "x2gomatebindings" ] && [ "${codename}" = "wheezy" ]; then + OTHERMIRROR="deb http://http.debian.net/debian ${codename}-backports main" fi # create git changelog immediately prior to building the package -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 7cb2bebe7e0908cf6e6520438216abcfea9c561c Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 14 06:03:03 2016 +0100 bin/sbuild-deb-package: fix package uploads: in X2Go context, we upload files to the ${PREFIX}-${DIST}-${DIST_CODENAME} location, not ${PREFIX}-${DIST}-${RELEASE_NAME} location. --- bin/sbuild-deb-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 7f5af51..8d83597 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -384,7 +384,7 @@ upload_packages() { [ "x${SKIP_ARCH}" != "x${l_ARCH}" ] && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}" test -f "./dupload.conf" || ln -s -- "${HOME}/.dupload.conf.${PREFIX}" "./dupload.conf" - ls -- "${DEBSRCPKG}_"*.changes >/dev/null 2>&1 && dupload -c --to "${PREFIX}-${l_DIST}-${COMPONENT}" "${DEBSRCPKG}_"*.changes 0<&- + ls -- "${DEBSRCPKG}_"*.changes >/dev/null 2>&1 && dupload -c --to "${PREFIX}-${l_DIST}-${l_CODENAME}" "${DEBSRCPKG}_"*.changes 0<&- } done done -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit ccb2d3a49fc6a68ce51fac4c367f01b2e7e25a26 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 14 06:04:44 2016 +0100 bin/sbuild-deb-package: don't build a source package manually. This change will break the script, but later commits will unbreak it. A side-effect of this is that we won't have a .dsc file (immediately), but we don't care about that as we'll be using the checked out sources for sbuild directly. This directory will stay clean, thanks to sbuild. The actual source package will be generated by sbuild during the build process. Another welcome side-effect is that we don't need to manually copy source tarballs around. --- bin/sbuild-deb-package | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 8d83597..e83c50c 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -313,11 +313,6 @@ 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 - # build the source package - dpkg-buildpackage -uc -us -S -d - cd .. - DSCFILE="$(pwd)/$(ls -1 "${DEBSRCPKG}_"*.dsc | head -n1)" - 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" @@ -327,12 +322,6 @@ build_packages() { [ "x${SKIP_ARCH}" != "xamd64" ] && grep -Eqs 'Architecture.*(all|any|amd64)' "${TEMP_DIR}/${PROJECT}/debian/control" && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/amd64" - tac ${DSCFILE} | while read line; do - if echo $line | grep -E "^Files:" 1>/dev/null; then break; fi - # each line contains a file that is part of the src:package - filename="$(echo $line | cut -d" " -f3-)" - if [ -n "$filename" ]; then cp "${TEMP_DIR}/${filename}" .; fi - done if [ -z "${OTHERMIRROR}" ]; then nice ${SBUILD} ${SBUILD_OPTIONS_64} "${DSCFILE}" else @@ -341,12 +330,6 @@ build_packages() { } [ "x${SKIP_ARCH}" != "xi386" ] && grep -Eqs 'Architecture.*(any|i386)' "${TEMP_DIR}/${PROJECT}/debian/control" && { cd "${PKGDIST}/${l_DIST}/${l_CODENAME}/i386" - tac ${DSCFILE} | while read line; do - if echo $line | grep -E "^Files:" 1>/dev/null; then break; fi - # each line contains a file that is part of the src:package - filename="$(echo $line | cut -d" " -f3-)" - if [ -n "$filename" ]; then cp "${TEMP_DIR}/${filename}" .; fi - done if [ -z "${OTHERMIRROR}" ]; then nice ${SBUILD} ${SBUILD_OPTIONS_32} "${DSCFILE}" else -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
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
-
git-admin＠x2go.org