From 334e9afa91427a6ac9a465ce0fc6c5c8643defb9 Mon Sep 17 00:00:00 2001 From: Steve McIntyre <93sam@debian.org> Date: Sun, 21 Feb 2021 13:53:17 +0000 Subject: [PATCH] Switch to using gcc-10 rather than gcc-9. Closes: #978521 --- debian/changelog | 1 + debian/control | 8 +++++++- debian/rules | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a7dc1d..5cc875b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ shim (15+1613861442.888f5b5-1) unstable; urgency=medium [ Steve McIntyre ] * Switch to much-newer upstream code point with many many fixes + Particularly pulling in SBAT changes for better revocation support + * Switch to using gcc-10 rather than gcc-9. Closes: #978521 -- Steve McIntyre <93sam@debian.org> Sun, 21 Feb 2021 13:50:16 +0100 diff --git a/debian/control b/debian/control index 10d83bc..06b167b 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,13 @@ Priority: optional Maintainer: Debian EFI team Uploaders: Steve Langasek , Steve McIntyre <93sam@debian.org> Standards-Version: 4.4.1 -Build-Depends: debhelper-compat (= 12), gnu-efi (>= 3.0u), sbsigntool, openssl, libelf-dev, gcc-9, pesign (>= 0.112-5) +Build-Depends: debhelper-compat (= 12), + gnu-efi (>= 3.0u), + sbsigntool, + openssl, + libelf-dev, + gcc-10, + pesign (>= 0.112-5) Vcs-Browser: https://salsa.debian.org/efi-team/shim Vcs-Git: https://salsa.debian.org/efi-team/shim.git diff --git a/debian/rules b/debian/rules index 5425ece..952f646 100755 --- a/debian/rules +++ b/debian/rules @@ -40,7 +40,7 @@ COMMON_OPTIONS += \ VENDOR_DBX_FILE=$(DBX_LIST) \ EFIDIR=$(distributor) \ CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- \ - CC=$(DEB_HOST_GNU_TYPE)-gcc-9 \ + CC=$(DEB_HOST_GNU_TYPE)-gcc-10 \ $(NULL) $(DBX_LIST): $(DBX_HASHES)