From patchwork Sat Aug 11 00:06:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10563231 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4501F157B for ; Sat, 11 Aug 2018 00:06:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 335522B033 for ; Sat, 11 Aug 2018 00:06:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 266142B2A1; Sat, 11 Aug 2018 00:06:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B7AA72B033 for ; Sat, 11 Aug 2018 00:06:50 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 47CD3210ED102; Fri, 10 Aug 2018 17:06:50 -0700 (PDT) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 059E6210ED0FC for ; Fri, 10 Aug 2018 17:06:48 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Aug 2018 17:06:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,221,1531810800"; d="scan'208";a="62290361" Received: from vverma7-desk1.lm.intel.com ([10.232.112.133]) by fmsmga008.fm.intel.com with ESMTP; 10 Aug 2018 17:06:17 -0700 From: Vishal Verma To: Subject: [ndctl PATCH] ndctl, prepare-release.sh: fix revision update checks Date: Fri, 10 Aug 2018 18:06:15 -0600 Message-Id: <20180811000615.11788-1-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.14.4 X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP The libtool versioning checks only need to prompt for a 'REVISION' update if the library source changed. We were triggering that check even if the utility source had changed. Fix by changing $libdir to the corresponding */lib/ directory. Signed-off-by: Vishal Verma --- contrib/prepare-release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/prepare-release.sh b/contrib/prepare-release.sh index 45be4d8..5009eec 100755 --- a/contrib/prepare-release.sh +++ b/contrib/prepare-release.sh @@ -105,8 +105,8 @@ check_libtool_vers() { local lib="$1" local lib_u="${lib^^}" - local libdir="${lib##lib}" - local symfile="${libdir}/lib/${lib}.sym" + local libdir="${lib##lib}/lib/" + local symfile="${libdir}/${lib}.sym" local last_cur=$(git show $last_ref:Makefile.am.in | grep -E "^${lib_u}_CURRENT" | cut -d'=' -f2) local last_rev=$(git show $last_ref:Makefile.am.in | grep -E "^${lib_u}_REVISION" | cut -d'=' -f2) local last_age=$(git show $last_ref:Makefile.am.in | grep -E "^${lib_u}_AGE" | cut -d'=' -f2)