Browse Source

crosstool-NG: fix version generation from tags

esp-1.24.x
Anton Maklakov 4 years ago
parent
commit
51ac162d55
  1. 2
      configure.ac
  2. 8
      maintainer/git-version-gen

2
configure.ac

@ -5,7 +5,7 @@ AC_PREREQ([2.67]) @@ -5,7 +5,7 @@ AC_PREREQ([2.67])
AC_INIT(
[crosstool-NG],
[m4_esyscmd_s([maintainer/git-version-gen --prefix crosstool-ng- .tarball-version])],
[m4_esyscmd_s([maintainer/git-version-gen .tarball-version])],
[crossgcc@sourceware.org],
[crosstool-ng],
[http://crosstool-ng.org])

8
maintainer/git-version-gen

@ -94,7 +94,7 @@ Options: @@ -94,7 +94,7 @@ Options:
Running without arguments will suffice in most cases."
prefix=v
prefix=
fallback=
while test $# -gt 0; do
@ -159,7 +159,7 @@ elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ @@ -159,7 +159,7 @@ elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
|| git describe --abbrev=7 HEAD 2>/dev/null` \
&& v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
&& case $v in
$prefix[0-9]*) ;;
$prefix*) ;;
*) (exit 1) ;;
esac
then
@ -215,10 +215,6 @@ if test "x$v_from_git" != x; then @@ -215,10 +215,6 @@ if test "x$v_from_git" != x; then
esac
fi
# Replace any dashes with underscores in the resulting version, to keep
# rpmbuild happy. See https://github.com/semver/semver/issues/145.
v=`echo "$v" | sed 's/-/_/g'`
# Omit the trailing newline, so that m4_esyscmd can use the result directly.
printf %s "$v"

Loading…
Cancel
Save