summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve McIntyre <93sam@debian.org>2021-02-21 13:53:17 +0000
committerSteve McIntyre <93sam@debian.org>2021-02-21 13:53:17 +0000
commit334e9afa91427a6ac9a465ce0fc6c5c8643defb9 (patch)
tree3d621afce1a7e60964edc496ba5c7294fabe92d1
parent371ed906c5a9e5a8219bf168209c801803ec7d1c (diff)
downloadefi-boot-shim-334e9afa91427a6ac9a465ce0fc6c5c8643defb9.tar.gz
efi-boot-shim-334e9afa91427a6ac9a465ce0fc6c5c8643defb9.zip
Switch to using gcc-10 rather than gcc-9. Closes: #978521
-rw-r--r--debian/changelog1
-rw-r--r--debian/control8
-rwxr-xr-xdebian/rules2
3 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 8a7dc1d0..5cc875b6 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 10d83bc2..06b167b3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,13 @@ Priority: optional
Maintainer: Debian EFI team <debian-efi@lists.debian.org>
Uploaders: Steve Langasek <vorlon@debian.org>, 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 5425ece0..952f6462 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)