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