From patchwork Tue Jun 16 07:41:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1310087 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 49mKsH4QFtz9sSd; Tue, 16 Jun 2020 17:41:55 +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 1jl6E9-0007Xu-4L; Tue, 16 Jun 2020 07:41:49 +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 1jl6E5-0007Xb-E3 for kernel-team@lists.ubuntu.com; Tue, 16 Jun 2020 07:41:45 +0000 Received: from mail-ej1-f70.google.com ([209.85.218.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jl6E5-0001I8-6g for kernel-team@lists.ubuntu.com; Tue, 16 Jun 2020 07:41:45 +0000 Received: by mail-ej1-f70.google.com with SMTP id m22so9059968ejn.4 for ; Tue, 16 Jun 2020 00:41:45 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=u9xcuHQQxvR92hL7ygHbXiSMSq+VxDoiiP3AAkLIcXk=; b=nzrmWiT48xt2hVd/rvNm42a1s5lWxCHHpxwnt4RvWiPSFv7eKkVdB0Pejq9b3aR5Zv fXtohIZxG9uycjQfz94t9NRjRFk+VtxIuJXi5vkC+DWlUvzFu4H265WajLZuTj+Jc+8m Av0cMkr8AfgLmofcGzpQRFKQYVfN+ptoDkeyPoXyZzSZYaTMk+hn9j1hzDEg3sw1eE36 Oz3Zp87zU2bajqK/xUYqN2UWfDsy6S2nefwjnb56QEmZV9B4Kot29QSzG9Eg9qqYfoOG fxjDH9qpZ/LL+NYZwIJD56BrRKAd6HzRkjMLS6snFOcJOrGyKh1LtCgkAmhpDoTnkCtg bD1Q== X-Gm-Message-State: AOAM531CSF1J9jUVu0FVXOe0swq0gPjqcznaJFDr3+qrwVBCItCIeRqb UoFLyT1HjPqa157DhmeW15Co4hQlyRG2sEY8GJgkzmrGjvI8FkM6G1N4fcJtDV4wQv3M/wRSoyO IrRnH2VwvfPKop2d1JVSRN9w2eYvMiZpdd6bn5R4VwA== X-Received: by 2002:a17:906:6094:: with SMTP id t20mr1641297ejj.359.1592293304695; Tue, 16 Jun 2020 00:41:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBp0uvEw29rbX3yDQSPURb0uYe8yMirZSHnowcagD0n6TSPbhk+2yqanjwD8pzFJhZ7P15+w== X-Received: by 2002:a17:906:6094:: with SMTP id t20mr1641290ejj.359.1592293304450; Tue, 16 Jun 2020 00:41:44 -0700 (PDT) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id bm9sm9573629edb.84.2020.06.16.00.41.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 00:41:44 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][bionic/linux-meta-hwe-5.4][PATCH 1/1] UBUNTU: [Packaging] Remove trailing '_18.04.x' from package version Date: Tue, 16 Jun 2020 09:41:10 +0200 Message-Id: <20200616074110.22392-2-juergh@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200616074110.22392-1-juergh@canonical.com> References: <20200616074110.22392-1-juergh@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" Signed-off-by: Juerg Haefliger Acked-by: Kleber Sacilotto de Souza --- update-version | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/update-version b/update-version index 8051cd21c6fa..22901b2084df 100755 --- a/update-version +++ b/update-version @@ -62,8 +62,9 @@ done # We need to ensure the ABI number matches our master source. # extract both for comparison. here_abi=${here_version%.*} -master_abi=$(echo ${master_version%.*} | sed -e 's/-/./g') -master_abi_human=${master_version%.*} +master_abi_human=${master_version%~*} +master_abi_human=${master_abi_human%.*} +master_abi=$(echo ${master_abi_human} | sed -e 's/-/./g') # Extract the upload number from the _previous_ upload and increment it. here_upload=${here_version##*.}