From 9b34f04e679c0fedfb8b9d6d8917ef888d426f83 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 16 Jul 2014 12:33:18 +0200 Subject: [PATCH] contrib/makerepo: update detection of base commit for libnl3 libnl3 now contains the git commit id in ./configure as LIBNL_GIT_SHA. Signed-off-by: Thomas Haller --- contrib/fedora/utils/makerepo.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/fedora/utils/makerepo.sh b/contrib/fedora/utils/makerepo.sh index a5f1d574ec..062406274c 100755 --- a/contrib/fedora/utils/makerepo.sh +++ b/contrib/fedora/utils/makerepo.sh @@ -249,6 +249,10 @@ pushd "$DIRNAME" # try to find the commit from which the original tarball originates # and base the new branch on to of it. RELEASE_BASE_COMMIT="$(sed -n 's/^NM_GIT_SHA=\(.*\)/\1/p' configure 2>/dev/null)" + elif [[ "$BUILD_LIBNL3" != "" ]]; then + # try to find the commit from which the original tarball originates + # and base the new branch on to of it. + RELEASE_BASE_COMMIT="$(sed -n 's/^LIBNL_GIT_SHA=\(.*\)/\1/p' configure 2>/dev/null)" elif [[ "$BUILD_NETWORMANAGER_OPENVPN" != "" ]]; then DATE="$(sed -n 's/%global snapshot .git\(20[0-3][0-9]\)\([0-1][0-9]\)\([0-3][0-9]\)/\1-\2-\3/p' "../$SPEC")" if [[ "x$DATE" != x ]]; then