diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-03-24 06:25:53 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-03-24 06:25:53 +0100 |
| commit | ad41adab1d626a83b31465d4f2002179fa0af7b3 (patch) | |
| tree | 5105d6b20a96638565aa5d6dfb40189904b1da05 | |
| parent | 17f916505006fa800d9d73fc24e730a53e4943fe (diff) | |
| download | buildscripts-ad41adab1d626a83b31465d4f2002179fa0af7b3.tar.gz buildscripts-ad41adab1d626a83b31465d4f2002179fa0af7b3.tar.bz2 buildscripts-ad41adab1d626a83b31465d4f2002179fa0af7b3.zip | |
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.
| -rwxr-xr-x | bin/build-rpm-package | 5 |
1 files 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/" \ |