[X2Go-Commits] [buildscripts] 01/01: {bin/sbuild-deb-package, home/.buildscripts/x2go.conf}: always add "extras" component to our builds.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit a5231d328be952c2c0f3866728680458ee28fb6e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Mar 3 20:44:14 2023 +0100

    {bin/sbuild-deb-package,home/.buildscripts/x2go.conf}: always add "extras" component to our builds.
---
 bin/sbuild-deb-package       | 5 +++--
 home/.buildscripts/x2go.conf | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index b3f2887..44490bc 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -31,6 +31,7 @@ DEBIAN_DISTROS="lenny,squeeze,wheezy,jessie,stretch,buster,bullseye,bookworm,sid
 RASPBIAN_DISTROS="jessie,stretch,buster,bullseye"
 UBUNTU_DISTROS="lucid,precise,trusty,xenial,yakkety"
 
+COMPONENT_EXTRAS='extras'
 COMPONENT_RELEASE="main"
 COMPONENT_NIGHTLY="nightly"
 COMPONENT_BUNDLES="bundle-release1 bundle-release2"
@@ -455,9 +456,9 @@ build_packages() {
 
 				OTHERMIRROR=""
 				if [ "x${COMPONENT}" = "x${COMPONENT_NIGHTLY}" ]; then
-					grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT_RELEASE} ${COMPONENT}"
+					grep -qs "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT_EXTRAS} ${COMPONENT_RELEASE} ${COMPONENT}"
 				else
-					grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT}"
+					grep "${PROJECT}" <<< "${PACKAGE_WITHOUT_OTHERMIRROR}" || OTHERMIRROR="deb http://${REPOS_SERVER}/${l_DIST} ${l_CODENAME} ${COMPONENT_EXTRAS} ${COMPONENT}"
 				fi
 				if [ "${PROJECT}" = "x2gomatebindings" ] && [ "${codename}" = "wheezy" ]; then
 					OTHERMIRROR="deb http://httpredir.debian.org/debian ${codename}-backports main"
diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf
index 8e92608..0c4696b 100644
--- a/home/.buildscripts/x2go.conf
+++ b/home/.buildscripts/x2go.conf
@@ -25,6 +25,7 @@ RPM_EXTRA_REPO_MOCK_CONFIG_BASE="x2go"
 OSX_DISTROS="10.11 10.13"
 OSX_REPOS_BASE="/srv/sites/x2go.org/code/releases/binary-macosx/"
 
+COMPONENT_EXTRAS='extras'
 COMPONENT_MAIN="main"
 COMPONENT_NIGHTLY="heuler"
 COMPONENT_RELEASES="testmain baikal saimaa"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git