From patchwork Mon Mar 8 14:59:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1449150 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 4DvM2r1N24z9sWw; Tue, 9 Mar 2021 02:00:19 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lJHMm-0004yC-Da; Mon, 08 Mar 2021 15:00:16 +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 1lJHMh-0004wN-2u for kernel-team@lists.ubuntu.com; Mon, 08 Mar 2021 15:00:11 +0000 Received: from mail-wr1-f71.google.com ([209.85.221.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lJHMg-00063C-Rg for kernel-team@lists.ubuntu.com; Mon, 08 Mar 2021 15:00:10 +0000 Received: by mail-wr1-f71.google.com with SMTP id z17so4931618wrv.23 for ; Mon, 08 Mar 2021 07:00:10 -0800 (PST) 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=oi8SOrB5R7iXQgGg7XEklsqy92ZsAeEQbfhw4cn57Tw=; b=GzeLNcmGuzW5rvX8tCK7RpvkyqpSRiy19inyB9avp0gLNgyF+VUbO5wQ146pQdb1zD XGNP2dRDS98WmgAS859InTnRKX9aUhgb5kDIqU8DPZ6Z62y9VDZNOi1Bq4OjtQyjl27e Q7hSDCDMzDb873CLRIn3fsl8ZZs+lZoicy6M/kttXTnow8QjWO6UWQOSECMlOIHLTUeZ youZXErvaleWZ5c8NqCNC3o7XHQo9zxoHnFpUlU8JJ3cu8k4PagQ9WApefkhPpMCXG/C viIb3+lCgLZFzd/L213HBjwg7xSm7CEHl44AkTHqF0lxS+q0lxdkwFah3HG04gXf9Lu6 SVxw== X-Gm-Message-State: AOAM531wSpnei+0fv2UWcEH32YVNA4caPjYDmJEIYBbyNTurJ28xurfM KnurnSADG7n6H8ZsQYB0lq5FtvhEONZzRJtnZy9sfIh/AlyjPFBUMAZpLoH4/T7PUxcxwB4Atm/ 3/DXvCPau0e3gLOwxqkjl0HwrbSLdE2SAU2w3o0B/uw== X-Received: by 2002:a5d:4e83:: with SMTP id e3mr23613920wru.82.1615215610161; Mon, 08 Mar 2021 07:00:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJwUFjY/wmu9bMFfVcK8+YLHXiSIq0Ojt3RuUUPq0MCZ6bBv6CWmHRHDCPpiBX5UxK6kPAxg+w== X-Received: by 2002:a5d:4e83:: with SMTP id e3mr23613904wru.82.1615215609934; Mon, 08 Mar 2021 07:00:09 -0800 (PST) Received: from localhost ([2001:470:6973:2:2843:61fd:9f2a:3b98]) by smtp.gmail.com with ESMTPSA id 3sm21748732wry.72.2021.03.08.07.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 07:00:09 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/9] UBUNTU: [Packaging] dkms-build--nvidia-N -- handle symbol versioning being enabled Date: Mon, 8 Mar 2021 14:59:58 +0000 Message-Id: <20210308150004.1746089-4-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210308150004.1746089-1-apw@canonical.com> References: <20210308150004.1746089-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" We get more linker commands emitted when symbol versioning is enabled. We don't need to replicate these command because we consume the .o files after these have been applied. Elide them from the BUILD/CLEAN helpers. This eliminates some frightening (but actually benign) error messages. BugLink: https://bugs.launchpad.net/bugs/1918134 Signed-off-by: Andy Whitcroft --- debian/scripts/dkms-build--nvidia-N | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/scripts/dkms-build--nvidia-N b/debian/scripts/dkms-build--nvidia-N index bdec782..5f07ef2 100755 --- a/debian/scripts/dkms-build--nvidia-N +++ b/debian/scripts/dkms-build--nvidia-N @@ -36,9 +36,8 @@ mkdir -p "$pkgdir/bits/scripts" # Install the support files we need. cp "$srcdir/scripts/module-common.lds" "$pkgdir/bits/scripts" -grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" >"$pkgdir/bits/BUILD" -grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" \ - -e 's/.*-o *\([^ ]*\) .*/rm -f \1/g' >"$pkgdir/bits/CLEAN" +grep /usr/bin/ld.bfd "$log" | grep -v scripts/genksyms/genksyms | sed -e "s@$build/@@g" >"$pkgdir/bits/BUILD" +sed -e 's/.*-o *\([^ ]*\) .*/rm -f \1/g' <"$pkgdir/bits/BUILD" >"$pkgdir/bits/CLEAN" # As the builds contain the absolute filenames as used. Use RECONSTRUCT to # rebuild the .ko's, sign them, pull off the signatures and then finally clean