[X2Go-Commits] [buildscripts] 07/12: bin/{build-rpm, sbuild-deb}-package: add new BUILD_BASE global option to select base building directory.
git-admin at x2go.org
git-admin at x2go.org
Mon Mar 11 14:46:39 CET 2024
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 at 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
More information about the x2go-commits
mailing list