Message ID | 20210308150004.1746089-10-apw@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> 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=<UNKNOWN>) 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 4DvM3318z3z9sVv; Tue, 9 Mar 2021 02:00:31 +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 <kernel-team-bounces@lists.ubuntu.com>) id 1lJHMw-00055W-BY; Mon, 08 Mar 2021 15:00:26 +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 <apw@canonical.com>) id 1lJHMr-00052b-Vp for kernel-team@lists.ubuntu.com; Mon, 08 Mar 2021 15:00:22 +0000 Received: from mail-wm1-f70.google.com ([209.85.128.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <apw@canonical.com>) id 1lJHMr-000657-ID for kernel-team@lists.ubuntu.com; Mon, 08 Mar 2021 15:00:21 +0000 Received: by mail-wm1-f70.google.com with SMTP id a65so2142922wmh.1 for <kernel-team@lists.ubuntu.com>; Mon, 08 Mar 2021 07:00:21 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lgov7cwOYtzCB4r7E/T8YNK+wKf9+lAokSo2TWhmo/k=; b=njr8M9PtbkKaGNJZsrKlfRTXBwIrD8KYDhK4/YssSPd4Dc+xxnVCxO+WBr7fSS2r+z jGsxyIPgR7k6G6ALXtEAEtMYjxsVCquJCyJB/z0YgLR/FkvQTosUzkYn0JVt4kXtLWEv OX4Hpkr6lC8ZLjaUnVxzsF+AqikWuiGHLVcosOH2PACObW4HeeZuVW2uIU12WfBemdmH 5CJE+NbIcUsYfm9JCgBbAp+7b3hIFlg2nA013uff7QOzxbY2Qas4sJxOXQEFshCbsp44 wEw47G5voRfPClKnY82ubFlCyUi6BhTe1p6LrJULtQlMKxsC7knVKJTDCDSv3udn66Bi HjTg== X-Gm-Message-State: AOAM533w1Y5aH09sQm3QWGw4fNYo/BzUZzxLgs6+ltSsl2zU0/B00YKq pOHA6em6DYHdJ1mL8k1kTDxgs98DCdP/8lJSELRta92bibefkF55g8vYuqm7No8/1HDLVxUbWkN 2qoTV5FpUgK/NBawW09gd1ZgTsUfIONrL1nvxKRyWng== X-Received: by 2002:a1c:1dd5:: with SMTP id d204mr22087036wmd.127.1615215620993; Mon, 08 Mar 2021 07:00:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0/67fW6fYn4rbI/sc2t2jEu1jw80S88qaeHBsuxbU7IRB6XlqlmgSNF6fjYXH17yuM1GB/A== X-Received: by 2002:a1c:1dd5:: with SMTP id d204mr22087006wmd.127.1615215620742; Mon, 08 Mar 2021 07:00:20 -0800 (PST) Received: from localhost ([2001:470:6973:2:2843:61fd:9f2a:3b98]) by smtp.gmail.com with ESMTPSA id p10sm19716020wrw.33.2021.03.08.07.00.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 07:00:20 -0800 (PST) From: Andy Whitcroft <apw@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH 9/9] UBUNTU: [Packaging] update-version -- handle forward-backport versioning Date: Mon, 8 Mar 2021 15:00:04 +0000 Message-Id: <20210308150004.1746089-10-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210308150004.1746089-1-apw@canonical.com> References: <20210308150004.1746089-1-apw@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 <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Cc: Andy Whitcroft <apw@canonical.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
LP#1918134 -- LRMv4 switch to signing with Ubuntu Kernel Modules signing key
|
expand
|
diff --git a/update-version b/update-version index f6d231b..4ee5c34 100755 --- a/update-version +++ b/update-version @@ -66,7 +66,7 @@ if dpkg --compare-versions "$here_version" lt "$master_version"; then elif dpkg --compare-versions "$here_version" eq "$master_version"; then here_newversion="$master_version+1" else - minor=$(( ${here_version#*+} + 1 )) + minor=$(( ${here_version##*+} + 1 )) here_newversion="$master_version+$minor" fi
We use versions linux 5.8.0-14.15+20.04.1 for the main kernel in forward-backport kernels. Therefore our version could be further suffixed: 5.8.0-14.15+20.04.1+1. Ensure we grab the final variant component only. BugLink: https://bugs.launchpad.net/bugs/1918134 Signed-off-by: Andy Whitcroft <apw@canonical.com> --- update-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)