This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit b4877a80f15b6e2dd1414c87afe7a94e136985c8 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Sep 8 08:05:10 2017 +0200 bin/build-rpm-package: override "$basearch" value in mock configs, needed on ppc64be. --- bin/build-rpm-package | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index d60b1cb..cf7aaf3 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -257,10 +257,11 @@ check_mock_version_atleast () { # # Calling this function in a subshell is an error, as it NEEDS to modify # variables in global scope! -create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET +create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET arch typeset MOCK_BASE="${1:?"Error: no mock base config passed to ${FUNCNAME}()."}" typeset COMPONENT="${2:?"Error: no component (X2Go release group) passed to ${FUNCNAME}()."}" typeset TARGET="${3:?"Error: no target (full or base) passed to ${FUNCNAME}()."}" + typeset arch="${4:?"Error: no architecture passed to ${FUNCNAME}()."}" # Check argument sanity. @@ -371,6 +372,8 @@ create_mock_config () { # MOCK_BASE CUSTOM_REPO COMPONENT TARGET case "${line}" in (*'$releasever'*) line="${line/'$releasever'/${VERSION}}" + ;;& + (*'$basearch'*) line="${line/'$basearch'/${arch}}" ;; (*) ;; esac @@ -547,7 +550,7 @@ get_extra_repository () { WANT="full" fi - create_mock_config "${DIST}-${CODENAME}-${ARCH}" "${COMPONENT}" "${WANT}" + create_mock_config "${DIST}-${CODENAME}-${ARCH}" "${COMPONENT}" "${WANT}" "${ARCH}" # Remove the .cfg extension again... and maybe add it back later. MOCK_CHROOT_CONFIG="${MOCK_CHROOT_CONFIG}${TMP_MOCK_CFG_FILE%.cfg}" -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git