From patchwork Tue Mar 12 15:57:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1055499 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 44JfkN6zRQz9s9N; Wed, 13 Mar 2019 02:57:32 +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 1h3jmQ-00060k-46; Tue, 12 Mar 2019 15:57:26 +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 1h3jmO-0005zH-Df for kernel-team@lists.ubuntu.com; Tue, 12 Mar 2019 15:57:24 +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-00059y-VV; Tue, 12 Mar 2019 15:57:24 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [disco/master-next 5/9] UBUNTU: [Packaging] dkms-build--nvidia* -- check gcc version against primary build Date: Tue, 12 Mar 2019 15:57:15 +0000 Message-Id: <20190312155719.3532-6-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" The binaries have the gcc version burned into them in a way which is not trivially correctable (as the length is not consistent). Check that the compiler version is the same in both builds using the version recorded in the buildinfo. BugLink: http://bugs.launchpad.net/bugs/1764792 Signed-off-by: Andy Whitcroft --- debian/scripts/dkms-build--nvidia-390 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/scripts/dkms-build--nvidia-390 b/debian/scripts/dkms-build--nvidia-390 index 093035c756a0..ee05d575af6d 100755 --- a/debian/scripts/dkms-build--nvidia-390 +++ b/debian/scripts/dkms-build--nvidia-390 @@ -47,9 +47,22 @@ grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" \ elif [ "$sign" = "--lrm" ]; then # We are in LRM build the package a copy in any signatures we can # find for them. These will be added after linking. + base="/usr/lib/linux/$abi_flavour" + + # Check the GCC version we are using against that used in the kernel + # NOTE: that we treat this as only a warning, as if the binaries did come + # out differently then we will actually + echo "II: checking gcc version ..." + cat "$base/compiler" + gcc --version + gcc_was=$(cat "$base/compiler" | sed -e 's/^GCC:/gcc/') + gcc_is=$(gcc --version | head -1) + if [ "$gcc_was" != "$gcc_is" ]; then + echo "WW: gcc version missmatch between linux and linux-restricted-modules" + echo "WW: was: $gcc_was is: $gcc_is" + fi # Apply any local signatures. - base="/usr/lib/linux/$abi_flavour" echo "II: adding signatures from $base ..." cp "$base/signatures/$package/"*".ko.sig" "$pkgdir/bits" sha256sum -c "$base/signatures/$package/SHA256SUMS" || exit 1