diff options
| author | Arnstein Ressem <aressem@oath.com> | 2019-01-04 09:59:53 +0100 |
|---|---|---|
| committer | Arnstein Ressem <aressem@oath.com> | 2019-01-04 09:59:53 +0100 |
| commit | cf252c718f29ceb90a96271df7ce55f36f6717c2 (patch) | |
| tree | 3897c448428234246867354a75805498bd0b86df /docker | |
| parent | 0f4f90afc161206436679675ecf8d04b8ad896e6 (diff) | |
Better option for skipping repo than ugly sed hack.
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/build/build-vespa-internal.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/build/build-vespa-internal.sh b/docker/build/build-vespa-internal.sh index 7e88aa77fdf..3a141234333 100755 --- a/docker/build/build-vespa-internal.sh +++ b/docker/build/build-vespa-internal.sh @@ -17,13 +17,9 @@ cd /vespa yum -y install epel-release yum -y install centos-release-scl -# CentOS messed up the source repo. The source repos are marked as enabled=0, but -# the yum-builddep below does not respect this setting. Hack around it for now. -sed -i 's,http://vault.centos.org/centos/7/sclo/Source/rh/,http://vault.centos.org/centos/7/sclo/Source/sclo/,g' /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo - yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/vespa/vespa/repo/epel-7/group_vespa-vespa-epel-7.repo -yum-builddep -y ~/rpmbuild/SPECS/vespa-${VESPA_VERSION}.spec +yum-builddep -y --setopt="centos-sclo-rh-source.skip_if_unavailable=true" ~/rpmbuild/SPECS/vespa-${VESPA_VERSION}.spec rpmbuild -bb ~/rpmbuild/SPECS/vespa-${VESPA_VERSION}.spec chown ${CALLER_UID}:${CALLER_GID} ~/rpmbuild/RPMS/x86_64/*.rpm mv ~/rpmbuild/RPMS/x86_64/*.rpm /vespa/docker |