[X2Go-Commits] [buildscripts] 01/01: bin/build-rpm/package: remove extraneous extras package repository from suse builds, remove ${ARCH} from extra repo wrapper and make note to some day make the layout consistent with the main repos.
git-admin at x2go.org
git-admin at x2go.org
Tue Mar 24 06:25:58 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository buildscripts.
commit ad41adab1d626a83b31465d4f2002179fa0af7b3
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Mar 24 06:25:53 2015 +0100
bin/build-rpm/package: remove extraneous extras package repository from suse builds, remove ${ARCH} from extra repo wrapper and make note to some day make the layout consistent with the main repos.
---
bin/build-rpm-package | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 3eac23b..834b6f4 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -180,7 +180,8 @@ get_extra_repository () {
# Note: we always add the extras repo, because that's defined as "packages missing from the main repository".
case "${TYPE}" in
"suse")
- ret="--repo http://${REPOS_SERVER}/${DIST}/${CODENAME}/extras/${ARCH}"
+ # FIXME: make this package repository consistent with our main ones.
+ ret="--repo http://${REPOS_SERVER}/${DIST}/${CODENAME}/extras"
if [ -z "${PACKAGE_WITHOUT_OTHERMIRROR}" ] || [ "${PACKAGE_WITHOUT_OTHERMIRROR}" != "${PACKAGE}" ]; then
ret="${ret} --repo http://${REPOS_SERVER}/${DIST}/${CODENAME}/${COMPONENT}/${ARCH}"
fi
@@ -405,7 +406,6 @@ build_packages() {
OTHERMIRROR="$(get_extra_repository "suse" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "x86_64")"
if sudo obs-build \
--nosignature \
- --repo "http://packages.x2go.org/${l_DIST}/$l_CODENAME/extras" \
--repo "$DOWNLOAD_URL" \
${OTHERMIRROR} \
--root "/var/cache/obs-build/$l_DIST/$l_CODENAME/x86_64/" \
@@ -483,7 +483,6 @@ build_packages() {
OTHERMIRROR="$(get_extra_repository "suse" "${l_DIST}" "${l_CODENAME}" "${COMPONENT}" "${PROJECT}" "i386")"
if linux32 sudo obs-build \
--nosignature \
- --repo "http://packages.x2go.org/${l_DIST}/$l_CODENAME/extras" \
--repo "$DOWNLOAD_URL" \
${OTHERMIRROR} \
--root "/var/cache/obs-build/$l_DIST/$l_CODENAME/i386/" \
--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
More information about the x2go-commits
mailing list