summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve McIntyre <steve@einval.com>2021-04-30 19:23:18 +0100
committerSteve McIntyre <steve@einval.com>2021-04-30 19:43:11 +0100
commit2ccaa89dba309538c8398b4da6ba812d7b78a573 (patch)
treee4b7ced49dc4d70e2e4ff543076375cf74ffeeff
parentf30975b003eaeea0df2a17e9710da7e9fb6ba89e (diff)
downloadshim-signed-2ccaa89dba309538c8398b4da6ba812d7b78a573.tar.gz
shim-signed-2ccaa89dba309538c8398b4da6ba812d7b78a573.zip
Tweak the Makefile setup
"make check" should not matter in terms of the package build. Closes: #936002
-rw-r--r--Makefile16
-rw-r--r--debian/changelog2
2 files changed, 13 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4dddd6d..1ad02f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
-all:
+all: verify
-check: check_$(EFI_ARCH)
+verify: verify_$(EFI_ARCH)
-check_x64 check_ia32:
+verify_:
+ @echo "EFI_ARCH is not set, ABORT"
+ @false
+
+verify_x64 verify_ia32:
mkdir -p build
# Verifying that the image is signed with the correct key.
sbverify --cert MicCorUEFCA2011_2011-06-27.crt shim$(EFI_ARCH).efi.signed
@@ -13,8 +17,10 @@ check_x64 check_ia32:
cmp shim$(EFI_ARCH).efi.signed build/shim$(EFI_ARCH).efi.signed
sha256sum shim$(EFI_ARCH).efi.signed build/shim$(EFI_ARCH).efi.signed
-check_aa64:
- echo "FOO"
+verify_aa64:
+ @echo "Copying unsigned arm64 shim into place, sorry :-("
+ mkdir -p build
+ cp /usr/lib/shim/shim$(EFI_ARCH).efi build/shim$(EFI_ARCH).efi.signed
clean:
rm -rf build
diff --git a/debian/changelog b/debian/changelog
index 0716929..0ef1871 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ shim-signed (1.34) UNRELEASED; urgency=medium
information. Separated out the binary package for arm64 to allow
for a different description, and tweaked the Makefile too.
* Update build-deps and Standards-Version
+ * Tweak Makefile setup - do our verification testing chained from
+ the "all" target, not "clean". Closes: #936002
-- Steve McIntyre <93sam@debian.org> Thu, 29 Apr 2021 22:04:33 +0100