diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-02-09 17:38:29 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-02-09 17:38:35 +0100 |
| commit | 01c880540b21afbc041d35b7e88abdc927df51e1 (patch) | |
| tree | 3040755f6823b15a7a7019241b083324ca4312a2 | |
| parent | 16d223831604152a2c2161a197b7ae863c35665c (diff) | |
| download | NetworkManager-01c880540b21afbc041d35b7e88abdc927df51e1.tar.gz | |
build-from-source: set $BUILD_SNAPSPOT to specify snapshot part of package version
Makes use of the new --snapshot option for build_clean.sh,
see 86a18b2df (contrib/rpm: make "snapshot" for package version
configurable via script).
| -rwxr-xr-x | contrib/rh-bkr/build-from-source.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/rh-bkr/build-from-source.sh b/contrib/rh-bkr/build-from-source.sh index ea26642d0e..50c7329e95 100755 --- a/contrib/rh-bkr/build-from-source.sh +++ b/contrib/rh-bkr/build-from-source.sh @@ -7,6 +7,7 @@ BUILD_DIR="${BUILD_DIR:-/tmp/nm-build}" BUILD_ID="${BUILD_ID:-master}" BUILD_REPO="${BUILD_REPO-https://github.com/NetworkManager/NetworkManager.git}" BUILD_REPO2="${BUILD_REPO2-git://github.com/NetworkManager/NetworkManager.git}" +BUILD_SNAPSHOT="${BUILD_SNAPSHOT:-}" ARCH="${ARCH:-`arch`}" WITH_DEBUG="$WITH_DEBUG" WITH_SANITIZER="$WITH_SANITIZER" @@ -132,7 +133,8 @@ if [[ "$DO_TEST_PACKAGE" == yes || "$DO_INSTALL" == yes ]]; then else A=("${A[@]}" --without sanitizer) fi - ./contrib/fedora/rpm/build_clean.sh -c "${A[@]}" + NM_BUILD_SNAPSHOT="${BUILD_SNAPSHOT}" \ + ./contrib/fedora/rpm/build_clean.sh -c "${A[@]}" fi if [[ "$DO_INSTALL" == yes ]]; then |