diff options
| author | Steve McIntyre <steve@einval.com> | 2019-04-19 15:19:43 +0100 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2019-04-19 15:19:43 +0100 |
| commit | 29f7fda1436283da8a69851dabcb85c22f70b792 (patch) | |
| tree | bdc267d6a15cb512bd84994d61563b59c5724af3 | |
| parent | dbf03a5792d5caf8b4a1a1e27729d2c98b54bcb7 (diff) | |
| download | shim-signed-29f7fda1436283da8a69851dabcb85c22f70b792.tar.gz shim-signed-29f7fda1436283da8a69851dabcb85c22f70b792.zip | |
Instead of hard-coding amd64 (x64), use a per-arch variable
| -rw-r--r-- | Makefile | 12 | ||||
| -rwxr-xr-x | debian/rules | 15 |
2 files changed, 17 insertions, 10 deletions
@@ -3,14 +3,12 @@ all: check: mkdir -p build # Verifying that the image is signed with the correct key. - sbverify --cert MicCorUEFCA2011_2011-06-27.crt shimx64.efi.signed + sbverify --cert MicCorUEFCA2011_2011-06-27.crt shim$(EFI_ARCH).efi.signed # Verifying that we have the correct binary. - sbattach --detach build/detached-sig shimx64.efi.signed - cp /usr/lib/shim/shimx64.efi build/shimx64.efi.signed - sbattach --attach build/detached-sig build/shimx64.efi.signed - cmp shimx64.efi.signed build/shimx64.efi.signed - cp /usr/lib/shim/fbx64.efi.signed build - cp /usr/lib/shim/mmx64.efi.signed build + sbattach --detach build/detached-sig shim$(EFI_ARCH).efi.signed + cp /usr/lib/shim/shim$(EFI_ARCH).efi build/shim$(EFI_ARCH).efi.signed + sbattach --attach build/detached-sig build/shim$(EFI_ARCH).efi.signed + cmp shim$(EFI_ARCH).efi.signed build/shim$(EFI_ARCH).efi.signed clean: rm -rf build diff --git a/debian/rules b/debian/rules index 60c3577..9c7880d 100755 --- a/debian/rules +++ b/debian/rules @@ -3,14 +3,23 @@ VERSION := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) SHIM_VERSION := $(shell dpkg-query -f '$${Version}\n' -W shim) +include /usr/share/dpkg/architecture.mk + +ifeq ($(DEB_HOST_ARCH),amd64) +export EFI_ARCH := x64 +endif +ifeq ($(DEB_HOST_ARCH),arm64) +export EFI_ARCH := aa64 +endif +ifeq ($(DEB_HOST_ARCH),i386) +export EFI_ARCH := ia32 +endif + %: dh $@ docdir := debian/shim-signed/usr/share/doc/shim-signed -override_dh_install: - dh_install - override_dh_installchangelogs: dh_installchangelogs # Quieten lintian, which otherwise gets confused by our odd version |