From patchwork Tue Jan 6 11:18:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 425623 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 6A8E51400B7; Tue, 6 Jan 2015 22:18:26 +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 1Y8S9V-0003lr-Ue; Tue, 06 Jan 2015 11:18:21 +0000 Received: from mail-wi0-f172.google.com ([209.85.212.172]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Y8S9N-0003lD-Ca for kernel-team@lists.ubuntu.com; Tue, 06 Jan 2015 11:18:13 +0000 Received: by mail-wi0-f172.google.com with SMTP id n3so5114916wiv.5 for ; Tue, 06 Jan 2015 03:18:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=m94fUMYhzZmGEifVIdkC1uHmsnRXW8iqHCq/PkU0nrQ=; b=YPSuI8sCRfLF+XNnP/SkPnp84km9Y3K2AaBr0DYHhmunV7RpFMh7TcOM0rXNP6YfMr pPO4vOxjwBI3u+t/yDym74Hnix3OMgTwS6KpxaG01OQKAfgBz28Ogi9eQDfNf2ihObi9 RA08WU6MBEiuRqYSd1dpzIhA9Uxf2EkxwJcBcs9DjS1TUVm9fE+/2moH748808xCwIjh Ha2aI56KE5Z6E4zS6hwg4EaO7cY6G0KNnwCOJUsfkmdyMS8h8P3leHLby7flew9n3gCP NcKiIKeguO7hzo3d4fz+CD8lanY6OQvzrm5PSwRiF/0QILZY93+U9VNqA6k5N0xxNRVm 71LQ== X-Gm-Message-State: ALoCoQnJ7mVUzZZ45RYQoZryj5a6rAbFFrXYcsPQnhMeTp5+8kFTlLs7bwRIJWLKQtvv3mWHNn+Y X-Received: by 10.194.91.205 with SMTP id cg13mr191951705wjb.21.1420543093252; Tue, 06 Jan 2015 03:18:13 -0800 (PST) Received: from localhost ([2001:470:6973:2:75a7:7f8b:e02b:a52b]) by mx.google.com with ESMTPSA id u1sm13549196wif.6.2015.01.06.03.18.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jan 2015 03:18:12 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [utopic 1/1] UBUNTU: [Packaging] uploadnum should be the remainder of the version Date: Tue, 6 Jan 2015 11:18:13 +0000 Message-Id: <1420543093-11751-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1420543093-11751-1-git-send-email-apw@canonical.com> References: <1420543093-11751-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft 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 uploadnum variable in debian/rules is somewhat confusingly named, it should be the "remainder of the version after -", not just the uploadnum itself. This version is only used for identification in uname -v and there it is completely appropriate for this to be complete with backport versions etc. BugLink: http://bugs.launchpad.net/bugs/1407755 Signed-off-by: Andy Whitcroft --- debian/rules.d/0-common-vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index d86914d..d2d62c1 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -65,7 +65,7 @@ abinum := $(shell echo $(revision) | sed -r -e 's/([^\+~]*)\.[^\.]+(~.*)?(\+.*) prev_abinum := $(shell echo $(prev_revision) | sed -r -e 's/([^\+~]*)\.[^\.]+(~.*)?(\+.*)?$$/\1/')$(abi_suffix) abi_release := $(release)-$(abinum) -uploadnum := $(shell echo $(revision) | sed -r -e 's/[^\+~]*\.([^\.~]+)(~.*)?(\+.*)?$$/\1/') +uploadnum := $(shell echo $(revision) | sed -r -e 's/[^\+~]*\.([^\.~]+(~.*)?(\+.*)?$$)/\1/') ifneq ($(full_build),false) uploadnum := $(uploadnum)-Ubuntu endif