From patchwork Thu Feb 7 10:30:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1037966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43wFsW05MYz9sLw; Thu, 7 Feb 2019 22:07:59 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1grhX7-0006iJ-Tc; Thu, 07 Feb 2019 11:07:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1grhX4-0006gc-IW for kernel-team@lists.ubuntu.com; Thu, 07 Feb 2019 11:07:50 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1grhX4-0002WQ-9f; Thu, 07 Feb 2019 11:07:50 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] UBUNTU: [Packaging] autoreconstruct -- base tag is always primary mainline version Date: Thu, 7 Feb 2019 10:30:07 +0000 Message-Id: <20190207103007.397-1-apw@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The base tag for autoreconstruct comparisons is always the primary mainline version. Since the switch to 3.x that has been the first two version number elements (VERSION and PATCHLEVEL). We already ignore the SUBLEVEL but inexplicibly take the EXTRAVERSION into account. This is plain wrong as the orig.tar.gz will, for example, be of v3.13 for the trusty kernel. The tag therefore is v$(VERSION).$(PATCHLEVEL). Drop the errant lookup and insertion of EXTRAVERSION into the upstream_tag specifier. BugLink: http://bugs.launchpad.net/bugs/1806380 Signed-off-by: Andy Whitcroft Acked-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader --- debian/rules.d/0-common-vars.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index 4d8886496090..e2e40b843200 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -15,8 +15,7 @@ prev_fullver ?= $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -o1 -c1 | sed # Get upstream version info upstream_version := $(shell sed -n 's/^VERSION = \(.*\)$$/\1/p' Makefile) upstream_patchlevel := $(shell sed -n 's/^PATCHLEVEL = \(.*\)$$/\1/p' Makefile) -upstream_extraversion := $(shell sed -n 's/^EXTRAVERSION = \(.*\)$$/\1/p' Makefile) -upstream_tag := "v$(upstream_version).$(upstream_patchlevel)$(upstream_extraversion)" +upstream_tag := "v$(upstream_version).$(upstream_patchlevel)" family=ubuntu