From patchwork Mon Apr 12 12:53:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1465250 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=) 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 4FJpb742Dzz9sX3; Mon, 12 Apr 2021 22:54:10 +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 1lVw4q-0006sj-FM; Mon, 12 Apr 2021 12:54:04 +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 1lVw4m-0006rd-QB for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2021 12:54:00 +0000 Received: from mail-ej1-f71.google.com ([209.85.218.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lVw4m-0000vT-I7 for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2021 12:54:00 +0000 Received: by mail-ej1-f71.google.com with SMTP id pj13so3835169ejb.10 for ; Mon, 12 Apr 2021 05:54:00 -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=QETqILPuhvzDLXTz+cvX5x1mdN/wUgSvD4OYmqsXqXk=; b=ARPPiVRkmV2yPkh9aM3Y958SPEjIqZBrLb92Ze2UwxN0Wd6dG0OwL/JPEeoY5EizrK Ov9ejnhf4IRx82oFfWxuMwe9fmcDPrDigOASLjwV9XrUOaV7IUGElz5C0bOlDvGW2VNo mUxs7vx9v9FGQqNqSj7GFe1IYoFBZ/wzO7Ep7rCiaQZsmspbgK09BhBPrDxa+Aprn46a p4IempWCDJHQMrWMCKgmeP2Ff68iYKYWzFrS6Qri5uPltIu7GNcXoBYVz/p0UZuHjvw8 lazwwG5nhN4WNSv3SUkLejnE6YCzq5A13faQqarLV9pGnIsYNvMiyJBy9IGbsDoii01v sPVw== X-Gm-Message-State: AOAM530kycRgHFaOa76ATMGVNhQiYlHQ58TtgOtEmBV3RlcNvppVEuBM EM5XL4jOBdgPv42ERlKPT8A0rNOS5d69TasgwXPekdTSvBLKrNU8tLckTDo+2ecaxd30hyb572B f/I8Tcdn0hglNerH2a3gZXADEqc5Ag2fZOUd7/sSElA== X-Received: by 2002:aa7:d691:: with SMTP id d17mr20852922edr.291.1618232040218; Mon, 12 Apr 2021 05:54:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwB/DtyTDKqGrE80f+9o+OfP4IDjJOpEXXSIuuyCpb+VT++KAXYCOrJ9Gjt9eF1tGEAJZLHZw== X-Received: by 2002:aa7:d691:: with SMTP id d17mr20852913edr.291.1618232040090; Mon, 12 Apr 2021 05:54:00 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id z20sm6687413edd.0.2021.04.12.05.53.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 05:53:59 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 1/3] UBUNTU: [Packaging] Drop versioned ABI directory names Date: Mon, 12 Apr 2021 14:53:56 +0200 Message-Id: <20210412125358.23098-2-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210412125358.23098-1-juergh@canonical.com> References: <20210412125358.23098-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" Versioned ABI directory names are not really necessary and make it difficult to follow the ABI history due to directory name changes between releases. So use directory names 'current' and 'previous' instead. Signed-off-by: Juerg Haefliger --- debian/rules.d/0-common-vars.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index f642cda1a185..c3e417e242e4 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -125,8 +125,8 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) CROSS_COMPILE ?= $(DEB_HOST_GNU_TYPE)- endif -abidir := $(CURDIR)/$(DEBIAN)/abi/$(release)-$(revision)/$(arch) -prev_abidir := $(CURDIR)/$(DEBIAN)/abi/$(release)-$(prev_revision)/$(arch) +abidir := $(CURDIR)/$(DEBIAN)/abi/current/$(arch) +prev_abidir := $(CURDIR)/$(DEBIAN)/abi/previous/$(arch) commonconfdir := $(CURDIR)/$(DEBIAN)/config archconfdir := $(CURDIR)/$(DEBIAN)/config/$(arch) sharedconfdir := $(CURDIR)/debian.master/config From patchwork Mon Apr 12 12:53:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1465247 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=) 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 4FJpb70PTkz9sWl; Mon, 12 Apr 2021 22:54:10 +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 1lVw4s-0006t0-Lr; Mon, 12 Apr 2021 12:54:06 +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 1lVw4n-0006rj-9i for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2021 12:54:01 +0000 Received: from mail-ed1-f72.google.com ([209.85.208.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lVw4n-0000vX-28 for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2021 12:54:01 +0000 Received: by mail-ed1-f72.google.com with SMTP id i12so3187955edu.23 for ; Mon, 12 Apr 2021 05:54:01 -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=yTVRjciM7QWH1HQeFg89X+RiJOmNuMRFDwMCLblkVdc=; b=s5IxBHRSqxcsWa7kEgLUBEl0+jNNKcOnsVVXq4lXp0nSpLQbh/OL9vxGKJ/fUJa6WF OAe50QqH+q1if4VAwz0OAmKBihulvBVzf0c+piBzvYtK7pdxRBmTtL/5f+yzsedyn23Y +ZIu51iawb80Ir49ZXwagnf74MQXltNmwF/farEEBtvFEJBrjOoAh/NPrRFhQYYVK1C4 fjS9WFy3NxSmb2C6qpormlsot2Mm0UU+86uwYg49fqCl4dSFnFjStXCoR2hr4StlJZiZ GwE6u5J/3aCCJhKEzrPpSNwL8UC32NFIbRnz1N7YMMJzf7XiSnWZVJfcpUG99s6J0tAF 6OFQ== X-Gm-Message-State: AOAM5309QyZDk9VJG1hJcUQFm3vqKx7KivsD7ZTSIeEE94X2xBxxFHnm f885lfcCxt7GqGF80Gte4U8OuxrAPH/rSW3orL6VivW6qlCpCMaldQSt12LZqyoW2uiG+uSLtb/ oOQm0/IXLbMhDcxqQDVet6fXvfHGrpTIHUAN516J9HQ== X-Received: by 2002:a17:906:86c2:: with SMTP id j2mr16264713ejy.257.1618232040742; Mon, 12 Apr 2021 05:54:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/5WcT1Hf12hdG+axSrtmJ1FbA+5pUMS0+VeEe9vkvSD1ObtM1Ayj+OSBhoMI3dbGgzXiJug== X-Received: by 2002:a17:906:86c2:: with SMTP id j2mr16264699ejy.257.1618232040526; Mon, 12 Apr 2021 05:54:00 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id z20sm6687413edd.0.2021.04.12.05.54.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 05:54:00 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 2/3] UBUNTU: [Packaging] getabis: Download ABIs into an unversioned directory Date: Mon, 12 Apr 2021 14:53:57 +0200 Message-Id: <20210412125358.23098-3-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210412125358.23098-1-juergh@canonical.com> References: <20210412125358.23098-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" Download the ABIs into the unversioned directory $DEBIAN/abi/previous and remove any old/versioned ABI directories. Also add a new file $DEBIAN/abi/previous/version that contains the ABI version that was previously part of the directory name for subsequent version checking. Signed-off-by: Juerg Haefliger --- debian/scripts/misc/getabis | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis index ebe4c4abdbc0..b2a5585fb618 100755 --- a/debian/scripts/misc/getabis +++ b/debian/scripts/misc/getabis @@ -168,6 +168,7 @@ getall_set() # Setup abi directory mkdir -p $abidir echo $abi > $abidir/abiname +echo $verfull > $abidir/version # NOTE: The flavours are hardcoded, because they may have changed from the # current build. @@ -187,8 +188,13 @@ mv fwinfo.tmp $fwinfo rmdir $tmpdir -# If this is running in a git repo, add the new ABI directory, remove the old +# Replace the previous ABI directory with the new one +abiprevdir="$(pwd)/$DEBIAN/abi/previous" +rm -rf "$abiprevdir" +mv "$abidir" "$abiprevdir" + +# If this is running in a git repo, add the current ABI directory and remove any old ones if [ -d ".git" ]; then - git add $abidir - find $DEBIAN/abi/* -maxdepth 0 -type d | grep -v $verfull | while read f; do git rm -r -f $f;done + git add "$abiprevdir" + find "$DEBIAN"/abi/* -maxdepth 0 -type d | grep -v '/previous$' | while read f; do git rm -rf "$f"; done fi From patchwork Mon Apr 12 12:53:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1465249 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=) 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 4FJpb7406rz9sX2; Mon, 12 Apr 2021 22:54:11 +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 1lVw4s-0006tM-Um; Mon, 12 Apr 2021 12:54:06 +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 1lVw4n-0006rp-Mx for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2021 12:54:01 +0000 Received: from mail-ed1-f70.google.com ([209.85.208.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lVw4n-0000vb-Fw for kernel-team@lists.ubuntu.com; Mon, 12 Apr 2021 12:54:01 +0000 Received: by mail-ed1-f70.google.com with SMTP id r12so3159940eds.15 for ; Mon, 12 Apr 2021 05:54:01 -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=4NcCa7AFiyQ77QzGeKyouXYJs95nYbVDUD/K/k5+IjU=; b=h7OMECLoJAH/ZswocSupVubHocifwqNCDxRMxFDpPs23HG/6EwVzls2GByxQEYVqLl vM9HT5qAh62Qm/LpW9UJ53rJqTPQJUwFbNKTlwLECYYqZaHv6IwT7pCdCDAssiIm1AGt N/jYZJcb61avL442PD76a3nDjEEr+fqGyYluMOl7hsGyarchUaH0h//JKzcPT3ySzH0I /qOPpUnrJqixxcXuXhsiPyV86WFlD+Zi0iPXU2bn/EIqJrBWXyjqOrA54p4ElFEsTaMd dbfbwwXtp2o4PrE8dosK5N5usPbf101cbe899hlIFIWD8UTBsbaTSq9QmUCL6y/D/KfN 3fxw== X-Gm-Message-State: AOAM533PVa+RgFpLFhNR0FVDULe0kM6HbJx+yVeByfDQshnPDTC2xOFF V4d8TjTJWiQb75gMtTCrN24wMxvx9Q7aqkae3RQ1juJ+Cl2jtwuLBjuVmBLXOfpma3fTk/v+K7h uVhBsY7GEC+TEnuLI4uUmSSURfhMb2n1fXIQMWza4Vg== X-Received: by 2002:a17:906:1453:: with SMTP id q19mr27791357ejc.76.1618232041206; Mon, 12 Apr 2021 05:54:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgwrR+sShArbGoUlbDvc6LrmZE9qBxYCBsNKCma89VwSVZhLweKzYZ3mloZJ4eMDTukx81Cw== X-Received: by 2002:a17:906:1453:: with SMTP id q19mr27791344ejc.76.1618232041009; Mon, 12 Apr 2021 05:54:01 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id z20sm6687413edd.0.2021.04.12.05.54.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Apr 2021 05:54:00 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 3/3] UBUNTU: [Packaging] final-checks: Handle unversioned ABI directories Date: Mon, 12 Apr 2021 14:53:58 +0200 Message-Id: <20210412125358.23098-4-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210412125358.23098-1-juergh@canonical.com> References: <20210412125358.23098-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" The ABI directory name is no longer versioned and the ABI version is now stored in a file in the ABI directory. Check that that file exists and contains the expected value. Signed-off-by: Juerg Haefliger --- debian/scripts/misc/final-checks | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks index 9532716c7ba1..a20e0a0f96ff 100755 --- a/debian/scripts/misc/final-checks +++ b/debian/scripts/misc/final-checks @@ -44,6 +44,18 @@ abi_check() fi } +abi_version="$debian/abi/previous/version" +if ! [ -f "$abi_version" ] +then + failure "$abi_version ABI version file missing" +fi + +version=$(cat "$abi_version") +if [ "$abi" != "$version" ] +then + failure "$abi_version ABI version mismatch ($abi != $version)" +fi + for arch in $archs do image_pkg=$(awk -F '\\s*=\\s*' '$1 == "do_flavour_image_package" { print $2 }' $debian/rules.d/$arch.mk) @@ -61,7 +73,7 @@ do for flavour in $flavours do flavour=$(echo "$flavour" | sed -e 's@.*/config.flavour.@@') - abi_check "$debian/abi/$abi" "$arch" "$flavour" + abi_check "$debian/abi/previous" "$arch" "$flavour" done done