aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Durigan Junior <sergiodj@redhat.com>2020-01-28 17:21:41 -0500
committerSergio Durigan Junior <sergiodj@redhat.com>2020-01-29 15:06:32 -0500
commitfc1ca146f76eea0b76b1392ea1a7aa8fb0742490 (patch)
treee23fab79b5d7de11092c21838a98c97181bfc11c
parent287c844a33a4d3b513bce17165158dd5fb2d820c (diff)
downloadbinutils-fc1ca146f76eea0b76b1392ea1a7aa8fb0742490.zip
binutils-fc1ca146f76eea0b76b1392ea1a7aa8fb0742490.tar.gz
binutils-fc1ca146f76eea0b76b1392ea1a7aa8fb0742490.tar.bz2
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 <sergiodj@redhat.com> * src-release.sh (getver): Look for gdbsupport's create-version.sh script at the current directory if tool is "gdb". Change-Id: Id3b8bed6583a1aaa120c07009366f6c94a62d5db
-rw-r--r--ChangeLog6
-rwxr-xr-xsrc-release.sh4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 582d1f2..3b835d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-28 Sergio Durigan Junior <sergiodj@redhat.com>
+
+ * 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 <simon.marchi@polymtl.ca>
* remote-sim.c (gdbsim_target::wait): Return
diff --git a/src-release.sh b/src-release.sh
index 92e92ac..1de971e 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