From 01c880540b21afbc041d35b7e88abdc927df51e1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 9 Feb 2018 17:38:29 +0100 Subject: [PATCH] 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). --- contrib/rh-bkr/build-from-source.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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