X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=.ci%2Fpackage%2Frpm%2Fbuild.sh;h=48f57addfffef020115ef9509b780748f60ecfc7;hb=09dda64ce99668c918fada04b9ad6bf9cd2ab104;hp=b07df47c35e1f62e79f0f4fcc1f3b6e5ea99426d;hpb=7619f84393f824a84e20e03167304b27d3581ac0;p=tinc diff --git a/.ci/package/rpm/build.sh b/.ci/package/rpm/build.sh index b07df47c..48f57add 100755 --- a/.ci/package/rpm/build.sh +++ b/.ci/package/rpm/build.sh @@ -1,23 +1,16 @@ #!/bin/bash -set -euo pipefail +set -euxo pipefail + +if ! rpm -qi openssl-devel; then + exit 0 +fi find_tag() { git describe --always --tags --match='release-*' "$@" } -# CentOS 7 has OpenSSL 1.1 installed in a non-default location. -if [ -d /usr/include/openssl11 ]; then - set -- "$@" --with-openssl-include=/usr/include/openssl11 -fi - -if [ -d /usr/lib64/openssl11 ]; then - set -- "$@" --with-openssl-lib=/usr/lib64/openssl11 -fi - spec=$HOME/rpmbuild/SPECS/tinc.spec -configure=$(sh .ci/conf.sh) - version=$(find_tag HEAD | sed 's/-/_/g') version=${version//release_/} @@ -28,10 +21,8 @@ rpmdev-setuptree cp "$(dirname "$0")/tinc.spec" "$spec" sed -i "s/__VERSION__/$version/" "$spec" -sed -i "s#__CONFIGURE_ARGS__#$configure#" "$spec" git clean -dfx -autoreconf -fsi cp -a . ~/rpmbuild/BUILD rpmbuild -bb "$spec"