From patchwork Thu Sep 20 07:36:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 972208 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 42G7nn515sz9s8T; Thu, 20 Sep 2018 17:36:13 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1g2tVP-0007Ol-3K; Thu, 20 Sep 2018 07:36:07 +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 1g2tVN-0007Oe-P1 for kernel-team@lists.ubuntu.com; Thu, 20 Sep 2018 07:36:05 +0000 Received: from mail-ed1-f72.google.com ([209.85.208.72]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1g2tVN-0001H4-HT for kernel-team@lists.ubuntu.com; Thu, 20 Sep 2018 07:36:05 +0000 Received: by mail-ed1-f72.google.com with SMTP id x24-v6so3758549edm.13 for ; Thu, 20 Sep 2018 00:36:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=mZqa6iuG5nQ5RO/xnnwCRFR4JVyhpe64x+cCycKCz6A=; b=c+LEpcZEM9IGA0oq7dLgcXSnWqZkEd0TIPwYoARH1gMDU44ldh+UmMf7NwZkeGwJ7r jAPsuKRo/FzAp0mRHHJRK/7sBFe+LqqXBb17pQPorCwvH+34cFEpGXhx3/8CdBlM/oqV n74SwbczoN1tIu8ZCvpRKBv3foQ2OXP3Lj1jIi3pHjFLh9/DiDaheXfhb6Jb9IPaWgpC y5DmkY6RQQwAcrSI573W8wLjrt310rajKbCLEnZO181OqnY3B5hfB9ItkY9l7vcUyjWH Udv+acUG0Ua0o9pIkOZ1mtaTvxlXaF53vX6vcqPa1J6jNY4gwgJ5o3aCMdG8XjaQ2Lc/ kH7Q== X-Gm-Message-State: APzg51AFSBfBbbbIZRXuZSPXyhNCEYRa0BZa/DAS0dEVpTPOyWTzsaOf Devaurz5r35dWAo9G+yPSyr0CJ39DONY1SszU+Dswqg6jJ557HZc25YxjXJ50H7hbarfMAJA3FA Pi6RSPfmkMibSmAHI6+jNn5moGU3fXP8U2gkuZznP X-Received: by 2002:a50:8dcb:: with SMTP id s11-v6mr2577765edh.86.1537428964899; Thu, 20 Sep 2018 00:36:04 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaA9zm/U2u80XmYOBPyirdcWBB7OCZK+irg94YoF0HVNGJ+WtAXbrckD996c7zWS50tN2mxSA== X-Received: by 2002:a50:8dcb:: with SMTP id s11-v6mr2577735edh.86.1537428964527; Thu, 20 Sep 2018 00:36:04 -0700 (PDT) Received: from localhost.localdomain (84-199-88-153.iFiber.telenet-ops.be. [84.199.88.153]) by smtp.gmail.com with ESMTPSA id m35-v6sm492104ede.14.2018.09.20.00.36.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Sep 2018 00:36:03 -0700 (PDT) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [P, T, X, A, B, C, D][PATCH] UBUNTU: [Packaging] startnewrelease: add support for backport kernels Date: Thu, 20 Sep 2018 04:36:02 -0300 Message-Id: <20180920073602.2400-1-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.17.1 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1793461 Update the startnewrelease target to support backport version numbers when creating the new changelog entry. Signed-off-by: Marcelo Henrique Cerri Acked-by: Thadeu Lima de Souza Cascardo Acked-by: Seth Forshee --- debian/rules.d/1-maintainer.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 1f592e53f78f..5d759f6e1e0a 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -125,11 +125,10 @@ diffupstream: startnewrelease: dh_testdir - @nextminor=$(shell expr `echo $(revision) | gawk -F. '{print $$2}'` + 1); \ - nextmajor=$(shell expr `echo $(revision) | awk -F. '{print $$1}'` + 1); \ + @ver=$$(echo "$(revision)" | perl -ne 'if (/^(\d*)\.(\d*)(.*)?$$/) { printf("%d.%d%s\n", $$1 + 1, $$2 +1, $$3) }'); \ now="$(shell date -R)"; \ - echo "Creating new changelog set for $(release)-$$nextmajor.$$nextminor..."; \ - echo -e "$(src_pkg_name) ($(release)-$$nextmajor.$$nextminor) UNRELEASED; urgency=medium\n" > $(DEBIAN)/changelog.new; \ + echo "Creating new changelog set for $(release)-$$ver..."; \ + echo -e "$(src_pkg_name) ($(release)-$$ver) UNRELEASED; urgency=medium\n" > $(DEBIAN)/changelog.new; \ echo " CHANGELOG: Do not edit directly. Autogenerated at release." >> \ $(DEBIAN)/changelog.new; \ echo " CHANGELOG: Use the printchanges target to see the curent changes." \