From patchwork Wed Jul 21 22:13:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1508481 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=h3feQatN; dkim-atps=neutral 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 4GVVGl65dNz9sjD; Thu, 22 Jul 2021 08:13:51 +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 1m6KTL-0007KR-HE; Wed, 21 Jul 2021 22:13:47 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m6KTK-0007Jf-El for kernel-team@lists.ubuntu.com; Wed, 21 Jul 2021 22:13:46 +0000 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id 4F8AC3F235 for ; Wed, 21 Jul 2021 22:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626905626; bh=nOXhSBxHnBKedH2IZoyPJWrw5wumFHDba7iNN1zz+Lw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h3feQatNNd27YjENCCkp0mvcy+CbGJdbHNuDUWrFv4vTaFONMm+YbOF0T7L44+XPm mgIsym6fWOA58p+NxvwtTGVslU6OjbiIIRWPrno7R+cejcoiNhV/yMV93sWX0qkM97 LQJ/9cKe1ohpxJ2a+mdva5G6GzJX7vQ2DsiKLYdhGYTxnGSrRFbLcb9/lmNOFGoA2B UZQeN2vmx9t5Wd4HKyTiuF2bpbM0X4zXQuDM8dp5wCmvc9k7N7uoMmaTRKu/lW4dmR kkTSKzB4vsj077RbLfHNronH9bTmTbIIsLjLuKkx6KbDTW1sDDRRvglCu76tWiRBTl bA5tY4GUVGyjQ== Received: by mail-wr1-f70.google.com with SMTP id p4-20020a5d63840000b0290126f2836a61so1567153wru.6 for ; Wed, 21 Jul 2021 15:13:46 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nOXhSBxHnBKedH2IZoyPJWrw5wumFHDba7iNN1zz+Lw=; b=R2IEAUc6JxGODSgbFp5z/hcUEKqje7JplEehSaQwMBD7A4D+4nR9PTEAB6SjNNAhop BHRG0om8EMR5b52dTf5Yr11RTdJ1Y5D+bUlkeGQvgP8crG2M0ErUapXro03Dv5/15OzU 2xTXPT9VCASCfuk9ki7J8ag/xPPoMTEeXpJGawMFY/1tqASep0kqXrHVkz7R4WwBAtad dhgbPdrP4S3+a+TK2v9gJ66bJM/2qOfNIQnwaml2OgdPJZIQ7pPEVjELAvokCPg/tjKA VaqEVw5n93M+Iod5YrTYD5H7NR1CcOYfM6lvmiFR+Ystq6c+7SbtTaYxM9CQJpVrdL/L 0dAA== X-Gm-Message-State: AOAM531qZ3kg+Wpbi6udGg6HXanvgbdGmP98xUdDiZisxAY2jYtqSKgp edE6XnSoF5adFqQTR2Uv2PEQ5tZyNUAibSBzsX83ORP17DRgmzbZj8vsD1AMyHQYaq5I01fbbJO jiUn9daP+UHqMzFYQrtLSqgwsyi+KRnlx5f+/TwrvQA== X-Received: by 2002:a05:600c:2197:: with SMTP id e23mr39734684wme.101.1626905625843; Wed, 21 Jul 2021 15:13:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKTGRDldikqg46Wybvg+6bEvyLkvuyE511U0KASGBJfAfcF2scIiVaYgs/61aTmazp6r+d7w== X-Received: by 2002:a05:600c:2197:: with SMTP id e23mr39734674wme.101.1626905625600; Wed, 21 Jul 2021 15:13:45 -0700 (PDT) Received: from localhost ([2001:470:6973:2:4cac:2286:3b31:9ac5]) by smtp.gmail.com with ESMTPSA id n23sm22159179wms.4.2021.07.21.15.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 15:13:45 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/4] UBUNTU: [Packaging] update-version -- allow specification of the master version Date: Wed, 21 Jul 2021 23:13:38 +0100 Message-Id: <20210721221338.159114-5-apw@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210721221338.159114-1-apw@canonical.com> References: <20210721221338.159114-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Allow the caller to supply the master version so we do not need to go look for it in the primary kernel. This is used during LRM only respins. BugLink: https://bugs.launchpad.net/bugs/1928921 Signed-off-by: Andy Whitcroft --- update-version | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/update-version b/update-version index 82794e8..cc55c39 100755 --- a/update-version +++ b/update-version @@ -6,6 +6,8 @@ tag_prefix=`dpkg-parsechangelog -S Source | sed 's/linux-restricted-modules/Ubun commit=: no_update=false +master_version= +master_dir= while : do if [ "$1" = "--commit" ]; then @@ -16,25 +18,33 @@ do shift no_update=true + elif [ "$1" = "--master-version" ]; then + master_version="$2" + shift 2 + else break fi done -if [ "$#" -ne 1 ]; then - echo "Usage: $0 " 1>&2 - exit 1 -fi -master_dir="$1" +if [ "$master_version" = "" ]; then + if [ "$#" -ne 1 ]; then + echo "Usage: $0 " 1>&2 + exit 1 + fi + master_dir="$1" -# Work out the master kernel version. -if [ -f "$master_dir/debian/debian.env" ]; then - branch=`sed -ne 's/DEBIAN=//p' <"$master_dir/debian/debian.env"` - changelog="-l$branch/changelog" + # Work out the master kernel version. + if [ -f "$master_dir/debian/debian.env" ]; then + branch=`sed -ne 's/DEBIAN=//p' <"$master_dir/debian/debian.env"` + changelog="-l$branch/changelog" + else + changelog="" + fi + master_version=`(cd "$master_dir" && LC_ALL=C dpkg-parsechangelog -SVersion $changelog)` else - changelog="" + no_update=true fi -master_version=`(cd "$master_dir" && LC_ALL=C dpkg-parsechangelog -S Version $changelog)` # Work out our current version taking into account closed sections. here_series=$( LC_ALL=C dpkg-parsechangelog -S Distribution )