From patchwork Wed Nov 4 22:25:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1394533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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 4CRLnN3gDLz9sVN; Thu, 5 Nov 2020 09:25:12 +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 1kaRDJ-0002HI-GU; Wed, 04 Nov 2020 22:25:09 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaRDG-0002Fm-5i for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 22:25:06 +0000 Received: from mail-oo1-f71.google.com ([209.85.161.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kaRDF-0008CF-QH for kernel-team@lists.ubuntu.com; Wed, 04 Nov 2020 22:25:05 +0000 Received: by mail-oo1-f71.google.com with SMTP id g15so34986oon.22 for ; Wed, 04 Nov 2020 14:25:05 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=nxTiVdFc2I9kWWcgkUtn7uEFjpDJAJO8FrS8nFCYB7g=; b=ocuGBe4Ce6wnm4Odz59+CtDhDtDteQsGG9vQVL6ug9s2KVUz2FzOZlz43P+EPJkXCB BoUFwmEvXPSazZCyNYonc00ecMbEsSUFfXvl73zKzuKo8wHU6T0+LgqV7EcAl69MEhhG FFpW28g1AyV2DjB9w7djUpEzYACwEJq0hxxzjfcTugGCgVF9YUrcjBnWGE6Az19M1QRi hwWZj173PqQEcPSnIPFc+ln6gcGiKjuuPDAU2rDsHsLG07HD0CEF2mU+n9gNXEWeP8/X cHoh4vOE5I6OVV4yJzz4GwiXUQ0TyPus71mNv81R0+aNe3D/03AVq0cW6m/lOhTCwggQ W5LA== X-Gm-Message-State: AOAM532+H1Zf2i/4wyT1JV1CiXtPgsWZAUyt6369yCF3cHVyhoDAKHSZ t4tHmDqqXzgR/QEYubs8MwbYymocE5a5hf/ZCYudoGh7EbzOgW4g3ToURhVmBqgqDnj5F+jByHb xz+pec2DMyvwYKbZ75Ohx2Ip3SKVb2U0z8+SsEyj2SQ== X-Received: by 2002:aca:c1c3:: with SMTP id r186mr3727677oif.164.1604528704610; Wed, 04 Nov 2020 14:25:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJzfInqoroW1TfB816V3F8L03meEmZyCTuJDz3PiaqOCoAbs3npv4gnz7FeiZ47SFSFDw96TGw== X-Received: by 2002:aca:c1c3:: with SMTP id r186mr3727665oif.164.1604528704406; Wed, 04 Nov 2020 14:25:04 -0800 (PST) Received: from localhost ([2605:a601:ac0f:820:480c:5c88:a771:1100]) by smtp.gmail.com with ESMTPSA id m13sm820308otn.20.2020.11.04.14.25.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 14:25:03 -0800 (PST) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Debian] Update for leader included in BACKPORT_SUFFIX Date: Wed, 4 Nov 2020 16:25:00 -0600 Message-Id: <20201104222500.38610-3-seth.forshee@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201104222500.38610-1-seth.forshee@canonical.com> References: <20201104222500.38610-1-seth.forshee@canonical.com> 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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1902957 Currently a ~ is always added to the version string before BACKPORT_SUFFIX. Now we will also doing forward-ports to development releases, which works exactly the same as a backport, but we want to use + as the leader instead. Our kernel source doesn't contain the information to determine which leader is appropriate, but that information is available when generating update.conf. Therefore the leader will be added as part of BACKPORT_SUFFIX, and our packaging should not insert any leader. Signed-off-by: Seth Forshee --- debian/rules.d/1-maintainer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 75e7647510ea..956829027e0f 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -142,7 +142,7 @@ startnewrelease: dh_testdir @[ -f "$(DEBIAN)/etc/update.conf" ] && . "$(DEBIAN)/etc/update.conf"; \ if [ -n "$$BACKPORT_SUFFIX" ]; then \ - ver="$$(dpkg-parsechangelog -l"$$DEBIAN_MASTER/changelog" -SVersion)~$${BACKPORT_SUFFIX}.1"; \ + ver="$$(dpkg-parsechangelog -l"$$DEBIAN_MASTER/changelog" -SVersion)$${BACKPORT_SUFFIX}.1"; \ prev_ver="$$(dpkg-parsechangelog -l"$(DEBIAN)/changelog" -SVersion)"; \ if [ "$${ver%.*}" = "$${prev_ver%.*}" ]; then \ ver="$${ver%.*}.$$(( $${prev_ver##*.} +1 ))"; \