From patchwork Tue May 11 07:28:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1476877 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 4FfV0C34nSz9t1C; Tue, 11 May 2021 17:28:43 +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 1lgMoq-0001jo-9z; Tue, 11 May 2021 07:28:40 +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 1lgMom-0001i5-2U for kernel-team@lists.ubuntu.com; Tue, 11 May 2021 07:28:36 +0000 Received: from mail-ed1-f69.google.com ([209.85.208.69]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lgMol-0006rU-RH for kernel-team@lists.ubuntu.com; Tue, 11 May 2021 07:28:35 +0000 Received: by mail-ed1-f69.google.com with SMTP id k10-20020a50cb8a0000b0290387e0173bf7so10506758edi.8 for ; Tue, 11 May 2021 00:28:35 -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=dOc/q86lBaaf6qxPYxjJMRpi5+yYybECRoV0BzEaF3A=; b=DJeq7if0toY+Ye7SXuDDnrPfbBF13+xP592TWKmlQgLDqKEe0hOkT34xZWsn7aHjz+ P1fhys2qTqyS96xGws2XxfWczrj7Z3aubL89ALKJPpT9iV7X9qrfQbmoaQwRmBeisNDP 1tQzH+w/B/Qc7sbxFZLGH7jCaGYRt+w+N9bJ0WCLbESgd7FUke0Ilr/b+eKh2qhSiUa9 d5uody+NtiODb1w0qEDOeXgjuIlNQBLPy3j6bXlgfambl7RBOHqpEvPoolO8p8Br0N35 E62S75WIcZpC4vT1htE4Ww4skGZT+7SBkYzAgg4P3pwbyNyZeGQBDAwkPW4Brdi7gVF3 h63w== X-Gm-Message-State: AOAM530RYIiVqHiNz+7ctVOgMKmqHuJ44BUMMT/aYbffHOF5ctuaFpgZ i5ZcRzjAA+NyC0xVlyD1L5cykcP/4ktwocepSCJjo8DnWPHv70GValV/1Xm2+KDCm+Z2xfkpir9 dYBPn6op42noR/Soy4Onm61ZMbEmcRDVPic3PjZhlSg== X-Received: by 2002:a17:906:c57:: with SMTP id t23mr24954804ejf.355.1620718115576; Tue, 11 May 2021 00:28:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfNjpKGYfCiGVCGUihzIVh0RjrX7sKeJcCd4MdN5i53Jl91e1/5GKkA6qdcWS2e7lalm3KNw== X-Received: by 2002:a17:906:c57:: with SMTP id t23mr24954790ejf.355.1620718115410; Tue, 11 May 2021 00:28:35 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id ho32sm823433ejc.82.2021.05.11.00.28.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 00:28:35 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 1/2] UBUNTU: [Packaging] Add list of built-in modules to the ABI Date: Tue, 11 May 2021 09:28:33 +0200 Message-Id: <20210511072834.488740-2-juergh@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210511072834.488740-1-juergh@canonical.com> References: <20210511072834.488740-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" Add a new file /modules.builtin to the buildinfo package that lists all the built-in modules. This will be used by the ABI checker to not complain about missing modules if module configs have changed from 'm' to 'y'. Signed-off-by: Juerg Haefliger --- debian/rules.d/2-binary-arch.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 0b008df5a853..641a9f2938e5 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -459,6 +459,12 @@ endif find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko | \ sed -e 's/.*\/\([^\/]*\)\.ko/\1/' | sort > $(abidir)/$*.modules + # Build the final ABI built-in modules information. + if [ -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin ] ; then \ + sed -e 's/.*\/\([^\/]*\)\.ko/\1/' $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin | \ + sort > $(abidir)/$*.modules.builtin; \ + fi + # Build the final ABI firmware information. find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko | \ while read ko; do \ @@ -499,6 +505,10 @@ endif $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/retpoline install -m644 $(abidir)/$*.compiler \ $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/compiler + if [ -f $(abidir)/$*.modules.builtin ] ; then \ + install -m644 $(abidir)/$*.modules.builtin \ + $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/modules.builtin; \ + fi ifneq ($(full_build),false) # Clean out this flavours build directory.