From patchwork Tue Mar 12 15:57:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1055497 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dmarc=fail (p=none dis=none) header.from=canonical.com 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 44JfkM66X7z9s5c; Wed, 13 Mar 2019 02:57:31 +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 1h3jmP-00060F-DZ; Tue, 12 Mar 2019 15:57:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1h3jmN-0005yv-Nm for kernel-team@lists.ubuntu.com; Tue, 12 Mar 2019 15:57:23 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1h3jmN-00059u-BN; Tue, 12 Mar 2019 15:57:23 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [disco/master-next 4/9] UBUNTU: [Packaging] dkms-build -- remove retpoline data from final binary packages Date: Tue, 12 Mar 2019 15:57:14 +0000 Message-Id: <20190312155719.3532-5-apw@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155719.3532-1-apw@canonical.com> References: <20190312155719.3532-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 only need the *.o files for reconstruction, elide the associated repoline data from the binary packages. BugLink: http://bugs.launchpad.net/bugs/1764792 Signed-off-by: Andy Whitcroft --- debian/scripts/dkms-build--nvidia-390 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/scripts/dkms-build--nvidia-390 b/debian/scripts/dkms-build--nvidia-390 index bbd3d97998a8..093035c756a0 100755 --- a/debian/scripts/dkms-build--nvidia-390 +++ b/debian/scripts/dkms-build--nvidia-390 @@ -15,9 +15,12 @@ shift 6 build="$( dirname "$objects" )/build" -# Copy over the objects ready for reconstruction. +# Copy over the objects ready for reconstruction. The objects copy contains +# the *.o files and the *.o-ur* retpoline files to allow the kernel to track +# any retpoline sequences therein. For our purposes we only want the *.o +# files, elide the rest. mkdir -p "$pkgdir/bits/scripts" -cp -rp "$objects"/* "$pkgdir/bits" +(cd "$objects" && find -name \*.o | cpio -Lpd "$pkgdir/bits") # Install the support files we need. cp "$srcdir/scripts/module-common.lds" "$pkgdir/bits/scripts"