mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-07 06:08:02 +02:00
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 <thaller@redhat.com>
This commit is contained in:
parent
682f26fd2d
commit
9b34f04e67
1 changed files with 4 additions and 0 deletions
|
|
@ -249,6 +249,10 @@ pushd "$DIRNAME"
|
||||||
# try to find the commit from which the original tarball originates
|
# try to find the commit from which the original tarball originates
|
||||||
# and base the new branch on to of it.
|
# and base the new branch on to of it.
|
||||||
RELEASE_BASE_COMMIT="$(sed -n 's/^NM_GIT_SHA=\(.*\)/\1/p' configure 2>/dev/null)"
|
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
|
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")"
|
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
|
if [[ "x$DATE" != x ]]; then
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue