From patchwork Tue Jan 28 22:25:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Durigan Junior X-Patchwork-Id: 37592 Received: (qmail 59275 invoked by alias); 28 Jan 2020 22:25:34 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 59259 invoked by uid 89); 28 Jan 2020 22:25:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=unavailable version=3.3.1 spammy=lives, junior X-HELO: us-smtp-delivery-1.mimecast.com Received: from us-smtp-1.mimecast.com (HELO us-smtp-delivery-1.mimecast.com) (205.139.110.61) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 28 Jan 2020 22:25:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580250330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OULOABdpKAkQnvnz6K5krzQbvZTLs5sk7YuQqX38fXA=; b=Gk26cJyQI/qKO1wTXsmFl00E1ye3MqDkIjQgEMjkjvCzp7702j3RHxQJwXwdso20q9W5YT V93GjmH7VNsXQeal+Fy2KtODQbM8jhNkA+9SumjOYWmCz6wUxBj1Zky1tC4qkYPpsZXn4s bxZ7RQPP/y0a2LUMZ9lq53Se811Jthc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-9YHGNfbTPxSfaUH7Ndjm5w-1; Tue, 28 Jan 2020 17:25:26 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D0388017CC; Tue, 28 Jan 2020 22:25:25 +0000 (UTC) Received: from psique.yyz.redhat.com (unused-10-15-17-196.yyz.redhat.com [10.15.17.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 390E77C42C; Tue, 28 Jan 2020 22:25:22 +0000 (UTC) From: Sergio Durigan Junior To: GDB Patches Cc: tom@tromey.com, binutils@sourceware.org, Sergio Durigan Junior Subject: [PATCH] Adjust src-release.sh's getver due to gdbsupport's move to toplevel Date: Tue, 28 Jan 2020 17:25:14 -0500 Message-Id: <20200128222514.10753-1-sergiodj@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-IsSubscribed: yes 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. OK? ChangeLog: 2020-01-28 Sergio Durigan Junior * src-release.sh (getver): Look for gdbsupport's create-version.sh script at the current directory. Change-Id: Id3b8bed6583a1aaa120c07009366f6c94a62d5db --- src-release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-release.sh b/src-release.sh index 92e92ac5d7..b3ca5ae137 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 -f ./gdbsupport/create-version.sh; 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