From fc1ca146f76eea0b76b1392ea1a7aa8fb0742490 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Tue, 28 Jan 2020 17:21:41 -0500 Subject: [PATCH] Adjust src-release.sh's getver due to gdbsupport's move to toplevel The move of gdbsupport to the top level directory requires a small change to src-release.sh's "getver" function, which is responsible for determining the version string that will be appended to the release tarball: now the create-version.sh script lives under ./gdbsupport, and not under gdb/gdbsupport anymore. This patch unbreaks the snapshot generation, which hasn't been working since January 14th. ChangeLog: 2020-01-29 Sergio Durigan Junior * src-release.sh (getver): Look for gdbsupport's create-version.sh script at the current directory if tool is "gdb". Change-Id: Id3b8bed6583a1aaa120c07009366f6c94a62d5db --- ChangeLog | 6 ++++++ src-release.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 582d1f27704..3b835d0c090 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-01-28 Sergio Durigan Junior + + * src-release.sh (getver): Look for gdbsupport's + create-version.sh script at the current directory if tool is + "gdb". + 2020-01-19 Simon Marchi * remote-sim.c (gdbsim_target::wait): Return diff --git a/src-release.sh b/src-release.sh index 92e92ac5d77..1de971eb01a 100755 --- a/src-release.sh +++ b/src-release.sh @@ -61,8 +61,8 @@ getver() $tool/common/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-git$//' rm -f VER.tmp - elif test -f $tool/gdbsupport/create-version.sh; then - $tool/gdbsupport/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp + elif test $tool = "gdb"; then + ./gdbsupport/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-git$//' rm -f VER.tmp elif test -f $tool/version.in; then -- 2.30.2