This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 979e653 bin/nsis-builder.bat: use UPX 4.0.2. new 98ea823 bin/debian-codename-to-version.sh: use single quotes where appropriate. new e29565e bin/debian-codename-to-version.sh: add trixie codename. new 27eb341 bin/sbuild-deb-package: add new debian distro "trixie" (current testing.) new c607146 home/.buildscripts/x2go.conf: add new debian distro "trixie" (current testing.) new 0d591e8 home/.dupload.conf.x2go: add new debian distro "trixie" (current testing.) new a6dbbbe bin/sbuild-deb-package: add new SKIP_ARCH_ALL boolean option to forcefully skip building of "Architecture: all" packages. new 4027a45 bin/{build-rpm,sbuild-deb}-package: add new BUILD_BASE global option to select base building directory. new bf23b21 bin/{build-rpm,sbuild-deb}-package: add new PKGDIST_BASE global option to select base pkg-dist directory. new 90bef9a bin/{build-rpm,sbuild-deb}-package: add 'arm' as recognized value to PLATFORM variable. new e9cad31 bin/sbuild-deb-package: also remove .buildinfo files (used for reproducible builds). new 546b8f4 bin/sbuild-deb-package: also support orig.tar.xz files. new 773c5fb bin/{sbuild-deb,build-rpm}-package: add FIXME note stating that GitLab clones don't seem to have an "origin" remote. The 12 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-rpm-package | 19 ++++++++++++++++-- bin/debian-codename-to-version.sh | 41 ++++++++++++++++++++------------------- bin/sbuild-deb-package | 37 +++++++++++++++++++++++++++++------ home/.buildscripts/x2go.conf | 2 +- home/.dupload.conf.x2go | 8 ++++++++ 5 files changed, 78 insertions(+), 29 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 27eb34191b801f1efe9f2a97a27792a41f1ebe70 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 12:20:36 2024 +0100 bin/sbuild-deb-package: add new debian distro "trixie" (current testing.) --- 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 87ee6bf..b9730c0 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -27,7 +27,7 @@ DEBEMAIL="firstname.lastname@mydomain.org" DEBFULLNAME="Firstname Lastname" GPG_KEY="" DEB_DISTS_SUPPORTED="debian ubuntu raspbian" -DEBIAN_DISTROS="lenny,squeeze,wheezy,jessie,stretch,buster,bullseye,bookworm,sid" +DEBIAN_DISTROS="lenny,squeeze,wheezy,jessie,stretch,buster,bullseye,bookworm,trixie,sid" RASPBIAN_DISTROS="jessie,stretch,buster,bullseye" UBUNTU_DISTROS="lucid,precise,trusty,xenial,yakkety" -- Alioth's /home/x2go-admin/maintenancescripts/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 e29565e6e910a15922dca7abc225d00de667e3ef Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 12:17:26 2024 +0100 bin/debian-codename-to-version.sh: add trixie codename. --- bin/debian-codename-to-version.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/debian-codename-to-version.sh b/bin/debian-codename-to-version.sh index d13169a..c07e96e 100755 --- a/bin/debian-codename-to-version.sh +++ b/bin/debian-codename-to-version.sh @@ -66,8 +66,9 @@ case "${codename}" in # For now and due to the aforementioned problems, # I decided to not handle the "testing" code name # at all. - ('bookworm') echo '12';; + ('trixie') echo '13';; + ('bookworm') echo '12';; ('bullseye') echo '11';; ('buster') echo '10';; ('stretch') echo '9';; -- Alioth's /home/x2go-admin/maintenancescripts/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 98ea823dcb3ea2cd3bf7fdd89ee93334bd662641 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 12:16:22 2024 +0100 bin/debian-codename-to-version.sh: use single quotes where appropriate. No functional changes. --- bin/debian-codename-to-version.sh | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/bin/debian-codename-to-version.sh b/bin/debian-codename-to-version.sh index 3c502fd..d13169a 100755 --- a/bin/debian-codename-to-version.sh +++ b/bin/debian-codename-to-version.sh @@ -38,13 +38,13 @@ if [ -z "${BASH_VERSINFO[0]}" ] || [ "${BASH_VERSINFO[0]}" -lt 4 ]; then codename="$(tr '[:upper:]' '[:lower:]' <<< "${codename}")" fi -typeset -i ret="0" +typeset -i ret='0' case "${codename}" in # The first version number is actually "fake", # but given it's a rolling release, # we can't really do better here. - ("sid"|"unstable") echo "9999";; + ('sid'|'unstable') echo '9999';; # FIXME: add "testing" - but how? It's not really # a stable release on its own, but a rolling @@ -66,26 +66,26 @@ case "${codename}" in # For now and due to the aforementioned problems, # I decided to not handle the "testing" code name # at all. - ("bookworm") echo "12";; + ('bookworm') echo '12';; - ("bullseye") echo "11";; - ("buster") echo "10";; - ("stretch") echo "9";; - ("jessie") echo "8";; - ("wheezy") echo "7";; - ("squeeze") echo "6";; - ("lenny") echo "5";; - ("etch") echo "4";; - ("sarge") echo "3.1";; - ("woody") echo "3.0";; - ("potato") echo "2.2";; - ("slink") echo "2.1";; - ("hamm") echo "2.0";; - ("bo") echo "1.3";; - ("rex") echo "1.2";; - ("buzz") echo "1.1";; + ('bullseye') echo '11';; + ('buster') echo '10';; + ('stretch') echo '9';; + ('jessie') echo '8';; + ('wheezy') echo '7';; + ('squeeze') echo '6';; + ('lenny') echo '5';; + ('etch') echo '4';; + ('sarge') echo '3.1';; + ('woody') echo '3.0';; + ('potato') echo '2.2';; + ('slink') echo '2.1';; + ('hamm') echo '2.0';; + ('bo') echo '1.3';; + ('rex') echo '1.2';; + ('buzz') echo '1.1';; - (*) ret="1";; + (*) ret='1';; esac exit "${ret}" -- Alioth's /home/x2go-admin/maintenancescripts/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 0d591e8c343ec59c7a67cf622b5d3de0ad2b0659 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 12:22:24 2024 +0100 home/.dupload.conf.x2go: add new debian distro "trixie" (current testing.) --- home/.dupload.conf.x2go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home/.dupload.conf.x2go b/home/.dupload.conf.x2go index d8f4926..95c4028 100644 --- a/home/.dupload.conf.x2go +++ b/home/.dupload.conf.x2go @@ -9,6 +9,14 @@ $cfg{"x2go-debian-sid"} = { queuedir => "/srv/sites/x2go.org/packages/debian/upload/sid", dinstall_runs => 1, }; +$cfg{"x2go-debian-trixie"} = { + fqdn => "code.x2go.org", + login => "x2go-admin", + method => "scpb", + incoming => "/srv/sites/x2go.org/packages/debian/incoming/trixie", + queuedir => "/srv/sites/x2go.org/packages/debian/upload/trixie", + dinstall_runs => 1, +}; $cfg{"x2go-debian-bookworm"} = { fqdn => "code.x2go.org", login => "x2go-admin", -- Alioth's /home/x2go-admin/maintenancescripts/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 c607146cb4a39429777d4523ee20454e7c5aeec0 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 12:21:32 2024 +0100 home/.buildscripts/x2go.conf: add new debian distro "trixie" (current testing.) --- home/.buildscripts/x2go.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf index 0c4696b..77a68af 100644 --- a/home/.buildscripts/x2go.conf +++ b/home/.buildscripts/x2go.conf @@ -7,7 +7,7 @@ GIT_SSH_PORT="32032" DEBEMAIL="git-admin@x2go.org" DEBFULLNAME="X2Go Git Administrator" DEB_DISTS_SUPPORTED="debian raspbian" -: ${DEB_BUILD_FOR:="debian:jessie,stretch,buster,bullseye,bookworm,sid raspbian:jessie,stretch,buster,bullseye"} +: ${DEB_BUILD_FOR:="debian:jessie,stretch,buster,bullseye,bookworm,trixie,sid raspbian:jessie,stretch,buster,bullseye"} # Shared for both RPM and DEB. GPG_KEY="F4A7678C9C6B0B2B" -- Alioth's /home/x2go-admin/maintenancescripts/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 a6dbbbe5b0cae6c9f6d982da6641b2034c88ae92 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 12:41:50 2024 +0100 bin/sbuild-deb-package: add new SKIP_ARCH_ALL boolean option to forcefully skip building of "Architecture: all" packages. --- bin/sbuild-deb-package | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index b9730c0..b2a2db7 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -54,6 +54,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PRE : ${NO_DELAY:="no"} : ${FORCE_BUILD:="no"} +: "${SKIP_ARCH_ALL:='no'}" : ${DEB_BUILD_FOR:="debian:${DEBIAN_DISTROS} ubuntu:${UBUNTU_DISTROS} raspbian:${RASPBIAN_DISTROS}"} : ${FLAVOR:="native"} : ${PLATFORM:="x86"} @@ -419,7 +420,7 @@ build_packages() { dch --distribution "${codename}" --force-distribution -l "~git${DATE}.${GITREV}+${numerical_version}.${COMPONENT}." "Development-Snapshot!!! Auto-built ${pretty_dist} ${l_CODENAME} (${numerical_version}) package for ${REPOS_SERVER} repository (Git commit: ${GIT_OBJECT_ID})." fi - typeset -i skip_arch_all="0" + typeset -i skip_arch_all="${SKIP_ARCH_ALL}" typeset -a arches arches=() case "${PLATFORM}" in @@ -624,6 +625,7 @@ set_vars "${@}" && { if [ "x$(basename "${0}")" = "x${PREFIX}-sbuild-deb-package" ] || [ "x$(basename "${0}")" = "x${PREFIX}-sbuild+upload-deb-package" ]; then FORCE_BUILD="$(make_boolean "${FORCE_BUILD}")" NO_DELAY="$(make_boolean "${NO_DELAY}")" + SKIP_ARCH_ALL="$(make_boolean "${SKIP_ARCH_ALL}")" cd "${PROJECT_DIR}" && { pkgneedsbuild "${CHECKOUT}" || [ "${FORCE_BUILD}" -eq "1" ] -- Alioth's /home/x2go-admin/maintenancescripts/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 bf23b2137e901426fa30a6d36cc7e2b02df23d61 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 12:55:17 2024 +0100 bin/{build-rpm,sbuild-deb}-package: add new PKGDIST_BASE global option to select base pkg-dist directory. Defaults to "${HOME}/pkg-dist". --- bin/build-rpm-package | 3 ++- bin/sbuild-deb-package | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 9ee5520..94b5c15 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -67,6 +67,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PRE : "${RPM_BUILD_FOR:="fedora:${FEDORA_DISTROS} epel:${EPEL_DISTROS} opensuse:${OPENSUSE_DISTROS} sle:${SLE_DISTROS}"}" : "${PLATFORM:="x86"}" : "${BUILD_BASE:="${HOME}/build"}" +: "${PKGDIST_BASE:="${HOME}/pkg-dist"}" # These parts are not user-serviceable. TMP_MOCK_CFG_DIR="" @@ -166,7 +167,7 @@ set_vars() { # setting paths PROJECT_DIR="${BUILD_BASE}/${COMPONENT}/${PROJECT}" - PKGDIST="${HOME}/pkg-dist/${COMPONENT}/${PROJECT}" + PKGDIST="${PKGDIST_BASE}/${COMPONENT}/${PROJECT}" # lock file LOCK_FILE="${PROJECT_DIR}/../.${PROJECT}.lock" diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 61e9f49..2aaa4e3 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -59,6 +59,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PRE : ${FLAVOR:="native"} : ${PLATFORM:="x86"} : "${BUILD_BASE:="${HOME}/build"}" +: "${PKGDIST_BASE:="${HOME}/pkg-dist"}" # These parts are not user-serviceable. typeset -ag temp_cleanup="" @@ -116,7 +117,7 @@ set_vars() { # setting paths PROJECT_DIR="${BUILD_BASE}/${COMPONENT}/${PROJECT}" - PKGDIST="${HOME}/pkg-dist/${COMPONENT}/${PROJECT}" + PKGDIST="${PKGDIST_BASE}/${COMPONENT}/${PROJECT}" # lock file LOCK_FILE="${PROJECT_DIR}/../.${PROJECT}.lock" -- Alioth's /home/x2go-admin/maintenancescripts/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 4027a45c9edc0b08e7dc1d651c10df3d8b6980e3 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 12:52:53 2024 +0100 bin/{build-rpm,sbuild-deb}-package: add new BUILD_BASE global option to select base building directory. Defaults to "${HOME}/build". --- bin/build-rpm-package | 3 ++- bin/sbuild-deb-package | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 6c38358..9ee5520 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -66,6 +66,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PRE : "${FORCE_BUILD:="no"}" : "${RPM_BUILD_FOR:="fedora:${FEDORA_DISTROS} epel:${EPEL_DISTROS} opensuse:${OPENSUSE_DISTROS} sle:${SLE_DISTROS}"}" : "${PLATFORM:="x86"}" +: "${BUILD_BASE:="${HOME}/build"}" # These parts are not user-serviceable. TMP_MOCK_CFG_DIR="" @@ -164,7 +165,7 @@ set_vars() { BUILD_NUMBER="${BUILD_NUMBER:-"0"}" # setting paths - PROJECT_DIR="${HOME}/build/${COMPONENT}/${PROJECT}" + PROJECT_DIR="${BUILD_BASE}/${COMPONENT}/${PROJECT}" PKGDIST="${HOME}/pkg-dist/${COMPONENT}/${PROJECT}" # lock file diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index b2a2db7..61e9f49 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -58,6 +58,7 @@ test -f "${HOME}/.buildscripts/${PREFIX}.conf" && . "${HOME}/.buildscripts/${PRE : ${DEB_BUILD_FOR:="debian:${DEBIAN_DISTROS} ubuntu:${UBUNTU_DISTROS} raspbian:${RASPBIAN_DISTROS}"} : ${FLAVOR:="native"} : ${PLATFORM:="x86"} +: "${BUILD_BASE:="${HOME}/build"}" # These parts are not user-serviceable. typeset -ag temp_cleanup="" @@ -114,7 +115,7 @@ set_vars() { BUILD_NUMBER="${BUILD_NUMBER:-"0"}" # setting paths - PROJECT_DIR="${HOME}/build/${COMPONENT}/${PROJECT}" + PROJECT_DIR="${BUILD_BASE}/${COMPONENT}/${PROJECT}" PKGDIST="${HOME}/pkg-dist/${COMPONENT}/${PROJECT}" # lock file -- Alioth's /home/x2go-admin/maintenancescripts/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 e9cad31aeb26e10ba15a52eedd3042bff4ad26a4 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 13:10:10 2024 +0100 bin/sbuild-deb-package: also remove .buildinfo files (used for reproducible builds). --- bin/sbuild-deb-package | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index a30d938..f616f48 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -304,6 +304,7 @@ clear_pkgdist() { rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.changes rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.upload rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.build + rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.buildinfo rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.dsc rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.tar.gz rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*.deb -- Alioth's /home/x2go-admin/maintenancescripts/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 90bef9afc7365cbd64028ea23111ce5b566761e3 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 7 13:07:39 2024 +0100 bin/{build-rpm,sbuild-deb}-package: add 'arm' as recognized value to PLATFORM variable. Currently unused by us. We handle ARM via Raspbian for *.deb builds, which is handled as a special distribution, and not at all for *.rpm builds. --- bin/build-rpm-package | 9 +++++++++ bin/sbuild-deb-package | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 94b5c15..99d7cfb 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -905,6 +905,9 @@ clear_pkgdist() { ("ppc64le") arches+=( "ppc64le" ) ;; + ('arm') + arches+=( 'aarch64' ) + ;; esac for l_ARCH in "${arches[@]}"; do @@ -959,6 +962,9 @@ build_packages() { ("ppc64le") arches+=( "ppc64le" ) ;; + ('arm') + arches+=( 'aarch64' ) + ;; esac typeset l_ARCH="${arches[0]}" @@ -1418,6 +1424,9 @@ upload_packages() { ("ppc64le") arches+=( "ppc64le" ) ;; + ('arm') + arches+=( 'aarch64' ) + ;; esac for l_ARCH in "${arches[@]}"; do diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 2aaa4e3..a30d938 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -290,6 +290,9 @@ clear_pkgdist() { # Only jessie and up support the new ppc64el architecture. [[ "${numerical_version}" -ge "8" ]] && arches+=( "ppc64el" ) ;; + ('arm') + arches+=( 'arm64' 'armhf' ) + ;; esac [ "${l_DIST}" = "raspbian" ] && arches=( "armhf" ) @@ -448,6 +451,10 @@ build_packages() { # Only jessie and up support the new ppc64el architecture. [[ "${numerical_version}" -ge "8" ]] && arches+=( "ppc64el" ) ;; + ('arm') + skip_arch_all='1' + arches+=( 'arm64' 'armhf' ) + ;; esac [ "${l_DIST}" = "raspbian" ] && arches=( "armhf" ) @@ -605,6 +612,9 @@ upload_packages() { # Only jessie and up support the new ppc64el architecture. [[ "${numerical_version}" -ge "8" ]] && arches+=( "ppc64el" ) ;; + ('arm') + arches+=( 'arm64' 'armhf' ) + ;; esac [ "${l_DIST}" = "raspbian" ] && arches=( "armhf" ) -- Alioth's /home/x2go-admin/maintenancescripts/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 546b8f41a58dcf95daa0d9f2f8f700e9b1ff4f83 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Mar 10 18:09:12 2024 +0100 bin/sbuild-deb-package: also support orig.tar.xz files. --- bin/sbuild-deb-package | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index f616f48..581679d 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -306,7 +306,7 @@ clear_pkgdist() { rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.build rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.buildinfo rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.dsc - rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.tar.gz + rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*_*.tar.{x,g}z rm -f -- "${PKGDIST}/${l_DIST}/${l_CODENAME}/${l_ARCH}/"*.deb } done @@ -345,7 +345,13 @@ build_packages() { git clone --no-hardlinks --no-local "${PROJECT_DIR}" "${TEMP_DIR}/${PROJECT}/" cd "${TEMP_DIR}/${PROJECT}" git checkout "${CHECKOUT}" || git checkout 'master' - find "${PROJECT_DIR}/../" -maxdepth 0 -mindepth 0 -type f | grep -qs "${PROJECT}_"*.orig.tar.gz && cp -- "${PROJECT_DIR}/../${PROJECT}_"*.orig.tar.gz .. + find "${PROJECT_DIR}/../" -maxdepth '0' -mindepth '0' -type 'f' | while read -r -d '' line; do + case "$(basename "${file}")" in + ("${PROJECT}_"*'.orig.tar.xz'|"${PROJECT}_"*'.orig.tar.gz') + cp -- "${file}" '..' + ;; + esac + done GITREV="$(gitrevno)" typeset gitdate="$(gitdate)" -- Alioth's /home/x2go-admin/maintenancescripts/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 773c5fb5fd13c61510a07ffcd0c80f12d39a9281 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Mar 11 14:41:16 2024 +0100 bin/{sbuild-deb,build-rpm}-package: add FIXME note stating that GitLab clones don't seem to have an "origin" remote. --- bin/build-rpm-package | 4 ++++ bin/sbuild-deb-package | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 99d7cfb..d25b39c 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -825,6 +825,10 @@ prepare_workspace() { git reset --hard git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" git fetch 'origin' "${CHECKOUT}" + # FIXME: there might be an issue with GitLab repositories not having an + # "origin" remote, but dropping this here would mean that our clones + # cannot be updated any longer. We'll keep it as-is for now and + # check the GitLab issue at a later time. git reset --hard "origin/${CHECKOUT}" git branch -D 'upstream' || true git fetch 'origin' 'upstream:upstream' || true diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package index 581679d..fa2a2f7 100755 --- a/bin/sbuild-deb-package +++ b/bin/sbuild-deb-package @@ -184,6 +184,10 @@ prepare_workspace() { git reset --hard git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" git fetch 'origin' "${CHECKOUT}" + # FIXME: there might be an issue with GitLab repositories not having an + # "origin" remote, but dropping this here would mean that our clones + # cannot be updated any longer. We'll keep it as-is for now and + # check the GitLab issue at a later time. git reset --hard "origin/${CHECKOUT}" git branch -D 'upstream' || true git fetch 'origin' 'upstream:upstream' || true -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org