From patchwork Thu Feb 2 11:22:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 722969 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vDd0012gsz9s7H; Thu, 2 Feb 2017 22:22:56 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cZFTV-0003Pv-61; Thu, 02 Feb 2017 11:22:49 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1cZFTQ-0003PG-JV for kernel-team@lists.ubuntu.com; Thu, 02 Feb 2017 11:22:44 +0000 Received: from 1.general.cascardo.us.vpn ([10.172.70.58] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1cZFTP-0003Yz-SN for kernel-team@lists.ubuntu.com; Thu, 02 Feb 2017 11:22:44 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [linux-meta Trusty lts-backport-xenial] UBUNTU: fix version suffixes in update-version Date: Thu, 2 Feb 2017 09:22:37 -0200 Message-Id: <20170202112237.4292-1-cascardo@canonical.com> X-Mailer: git-send-email 2.9.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com The versions should be stripped of ~* suffixes in order to get the proper ABI number. For example, when the master version is 4.4.0-63.84~14.04.1, the script would consider 4.4.0-63.84~14.04 as the ABI instead of 4.4.0-63. It would also end up using the incorrect version and tag for the linux-meta package. Stripping the master version from its ~14.04.1 suffix fixes it. Signed-off-by: Thadeu Lima de Souza Cascardo --- update-version | 1 + 1 file changed, 1 insertion(+) diff --git a/update-version b/update-version index 8f9a4d9..0599968 100755 --- a/update-version +++ b/update-version @@ -16,6 +16,7 @@ else changelog="" fi master_version=`(cd "$master_dir" && LC_ALL=C dpkg-parsechangelog -S Version $changelog)` +master_version=${master_version%~*} # Work out our current version taking into account closed sections. here_series=$( LC_ALL=C dpkg-parsechangelog -S Distribution )