From patchwork Mon May 3 08:47:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1473072 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 4FYc6X1pWcz9sW7; Mon, 3 May 2021 18:47:15 +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 1ldUER-0007Q8-Nn; Mon, 03 May 2021 08:47:11 +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 1ldUEP-0007Pf-SX for kernel-team@lists.ubuntu.com; Mon, 03 May 2021 08:47:09 +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 1ldUEP-0003OH-K3 for kernel-team@lists.ubuntu.com; Mon, 03 May 2021 08:47:09 +0000 Received: by mail-ej1-f70.google.com with SMTP id p25-20020a1709061419b0290378364a6464so1721932ejc.15 for ; Mon, 03 May 2021 01:47:09 -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=7INkgXHxrBcksDLj1WXGne3xZLVItDVee50GsqzOZk8=; b=pi2ngQK9wggTH8/S41m2cqLppurE6tP3sL5C4B41aF3RX5f52XYreBYRpdGD1JZSNf MCI7+YvSrCFTuPDV06e5MGJKlUzwxEFYW/MkNT8xUIzMzo5BkA3zR+E3hgr/xTOVi3Il y3K1GlngHbNqoVEk97X/xIiWSDGNpeLlGS5G+FtubgrQGavK6Ys+vvQmOVMowmVedUpg 8WRISXSJvnpnPsRqdaLlWqvTWiFTurg/BdkMFhYrrJ0+xP60Kb9a9NcYiet1Fp4NpEko bdVxiQm64/eLKF/lL9Sg8uXsp3B6wKsuOBqI5NP/AzLBHUIaHwq7b7sxIHylmqhrQwa3 JSaQ== X-Gm-Message-State: AOAM530KIBe30EPyr2HOVgp2D2/m4F2EDU7xj9BqCT/xQ3jzSBJvAbPq xGJqZnbWYii+jt5N5P7C/DOI0iu12inJPmK6PS/tXeh8o6RjO80afaEMCOJ4qiBZgMYvhhGwHqV rJvHR39VeVe1n0CrWpyDgR7VMjQ4adfUv1sO7fwvbgA== X-Received: by 2002:a17:906:f6d0:: with SMTP id jo16mr5971714ejb.461.1620031629387; Mon, 03 May 2021 01:47:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZeX2Vx+HLBcWKGDkkN+zrituy/y09edBQRaYUvTlrJIBUQ9YOqZ9eKfPYpx5OC4vzVF1XTQ== X-Received: by 2002:a17:906:f6d0:: with SMTP id jo16mr5971704ejb.461.1620031629232; Mon, 03 May 2021 01:47:09 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id l15sm11365109edb.48.2021.05.03.01.47.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 01:47:08 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 1/2] UBUNTU: [Packaging] Move the ABI files up by one directory level Date: Mon, 3 May 2021 10:47:06 +0200 Message-Id: <20210503084707.141209-2-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210503084707.141209-1-juergh@canonical.com> References: <20210503084707.141209-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 current ABI root directory name is /__abi.current/ which should clearly indicate that it's a temporary directory. Signed-off-by: Juerg Haefliger --- debian/rules.d/0-common-vars.mk | 4 ++-- debian/scripts/misc/final-checks | 2 +- debian/scripts/misc/getabis | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index c3e417e242e4..d70308bb6737 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/current/$(arch) -prev_abidir := $(CURDIR)/$(DEBIAN)/abi/previous/$(arch) +abidir := $(CURDIR)/$(DEBIAN)/__abi.current/$(arch) +prev_abidir := $(CURDIR)/$(DEBIAN)/abi/$(arch) commonconfdir := $(CURDIR)/$(DEBIAN)/config archconfdir := $(CURDIR)/$(DEBIAN)/config/$(arch) sharedconfdir := $(CURDIR)/debian.master/config diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks index a20e0a0f96ff..e7d86a453465 100755 --- a/debian/scripts/misc/final-checks +++ b/debian/scripts/misc/final-checks @@ -44,7 +44,7 @@ abi_check() fi } -abi_version="$debian/abi/previous/version" +abi_version="$debian/abi/version" if ! [ -f "$abi_version" ] then failure "$abi_version ABI version file missing" diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis index b2a5585fb618..ba0af3353741 100755 --- a/debian/scripts/misc/getabis +++ b/debian/scripts/misc/getabis @@ -24,7 +24,7 @@ verfull=$ver-$revision WGET="wget --tries=1 --timeout=10 --quiet -c" -abidir="`pwd`/$DEBIAN/abi/$verfull" +abidir="`pwd`/$DEBIAN/__abi.current" tmpdir="`pwd`/abi-tmp-$verfull" origdir="`pwd`" fwinfo=$abidir/fwinfo @@ -166,6 +166,7 @@ getall_set() # MAIN # Setup abi directory +rm -rf "$abidir" mkdir -p $abidir echo $abi > $abidir/abiname echo $verfull > $abidir/version @@ -189,12 +190,11 @@ mv fwinfo.tmp $fwinfo rmdir $tmpdir # Replace the previous ABI directory with the new one -abiprevdir="$(pwd)/$DEBIAN/abi/previous" +abiprevdir="$(pwd)/$DEBIAN/abi" 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 this is running in a git repo, add the updated ABI files if [ -d ".git" ]; then 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 May 3 08:47:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1473070 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 4FYc6X1yXHz9sW8; Mon, 3 May 2021 18:47:15 +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 1ldUES-0007QX-So; Mon, 03 May 2021 08:47:12 +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 1ldUEQ-0007Pr-Bk for kernel-team@lists.ubuntu.com; Mon, 03 May 2021 08:47:10 +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 1ldUEQ-0003P3-47 for kernel-team@lists.ubuntu.com; Mon, 03 May 2021 08:47:10 +0000 Received: by mail-ed1-f72.google.com with SMTP id y15-20020aa7d50f0000b02903885ee98723so4095327edq.16 for ; Mon, 03 May 2021 01:47:10 -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=rF2Dhc2VGtSwB2DjKk7NP+aeobIxk7Fxb+IB4O5dmmY=; b=aSGOW/c37hxJUAWSrVjnu+4xZWSXpzHimyu4JObR1LeDEm2mmDrgk2TSkz+FbcjG/A WwRnfFHCArPm6hYqj/oSPbldj5lOkc6I5orBvc3dldFQwgvB55t1X+BpRsTSE9F78Nde +ELDxdfyz0mDlxi5i0czz+CnGEJgHyNF4L70Zc2Lv1KXeJK9+CwTGnOPQKw299ryVELx SW0OjCZhFbqEN6LBTLXAA3vJ/RLFC2ydBvEFanFsqsAP6K8TuN6bHCn49F1D+kQdN2Q0 eCYt7YXcM2gu0ZKUjMybpeGGe9defF+GjX6edy8pU1Qim+VT1tBvvfxwZ+Phgwsfahue xMKQ== X-Gm-Message-State: AOAM533iGETaSVMyYDzOgtq33x2yF5MjwSRR41nm2qZMRuZQZZAOqvLt 3F96RrVaawf3JkCDloZ/Sol4Fym00Ym9P21tXi0+GdAKIZIIsNvgEBav32aOEVmPe9suVGI97Yi 3EATr9ip6JwCiapN5ztBfToRTKrosSBtpkx0RBxO93A== X-Received: by 2002:a17:906:953:: with SMTP id j19mr15789000ejd.56.1620031629841; Mon, 03 May 2021 01:47:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTFIUCFd0/SuUudklN7gvzNXOl7+NmjlebYi50cCuE4yuAoeWT2EoahJAXj774XXWCwAJM1Q== X-Received: by 2002:a17:906:953:: with SMTP id j19mr15788987ejd.56.1620031629689; Mon, 03 May 2021 01:47:09 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id l15sm11365109edb.48.2021.05.03.01.47.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 01:47:09 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 2/2] UBUNTU: [Packaging] Drop the processing of perm-blacklist Date: Mon, 3 May 2021 10:47:07 +0200 Message-Id: <20210503084707.141209-3-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210503084707.141209-1-juergh@canonical.com> References: <20210503084707.141209-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" perm-blacklist lists modules and/or symbols that are permanently excluded from the ABI check. AFAICT this hasn't been used in ages and with the previous commit it would move up one level which puts it outside of the ABI directory. That in itelf is not problematic just not pretty. Take this opportunity to get rid of the whole (unsued) concept. We can always add it back later should the need arise (and then should probably rename it to abi.perm-blacklist to make it clear that it's a file related to the ABI). Signed-off-by: Juerg Haefliger --- debian/scripts/abi-check | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/scripts/abi-check b/debian/scripts/abi-check index c7a02c5589af..d065f3d698c0 100755 --- a/debian/scripts/abi-check +++ b/debian/scripts/abi-check @@ -53,7 +53,7 @@ my %module_syms; my $ignore = 0; print " Reading symbols/modules to ignore..."; -for $file ("$prev_abidir/../blacklist", "$prev_abidir/../../perm-blacklist") { +for $file ("$prev_abidir/../blacklist") { if (-f $file) { open(IGNORE, "< $file") or die "Could not open $file";