debian/rules, debian/shim.install: make sure the 'make install' step does what it's meant to do by upstream: we can easily make use of the end result to have the files we need.

This commit is contained in:
Mathieu Trudel-Lapierre 2017-08-31 19:10:10 -04:00
parent 0e7f9a71d6
commit c3fa729980
3 changed files with 20 additions and 10 deletions

3
debian/changelog vendored
View File

@ -26,6 +26,9 @@ shim (12+1503074702.5202f80-0ubuntu1~test3) artful; urgency=medium
target.
* debian/patches/buildid_write_return.patch: workaround our strict compile
rules failing the build: make sure write calls check the return value.
* debian/rules, debian/shim.install: make sure the 'make install' step does
what it's meant to do by upstream: we can easily make use of the end result
to have the files we need.
-- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Tue, 29 Aug 2017 22:45:30 -0400

20
debian/rules vendored
View File

@ -6,14 +6,25 @@
# should be building the other binaries also.
ifeq ($(shell dpkg-vendor --is ubuntu && echo yes),yes)
cert=debian/canonical-uefi-ca.der
distributor=ubuntu
else
cert=debian/debian-uefi-ca.der
distributor=debian
endif
ifeq ($(DEB_HOST_ARCH),amd64)
export EFI_ARCH := x64
endif
COMMON_OPTIONS = \
MAKELEVEL=0 \
EFI_PATH=/usr/lib \
ENABLE_SHIM_CERT=1 \
ENABLE_SBSIGN=1 \
VENDOR_CERT_FILE=$(cert) \
EFIDIR=$(distributor) \
$(NULL)
%:
dh $@ --parallel
@ -22,15 +33,10 @@ override_dh_auto_clean:
rm -f *.signed
override_dh_auto_build:
dh_auto_build -- \
MAKELEVEL=0 \
EFI_PATH=/usr/lib \
ENABLE_SHIM_CERT=1 \
ENABLE_SBSIGN=1 \
VENDOR_CERT_FILE=$(cert)
dh_auto_build -- $(COMMON_OPTIONS)
override_dh_auto_install:
dh_auto_install -- MAKELEVEL=0 EFIDIR=ubuntu
dh_auto_install --destdir=debian/tmp -- $(COMMON_OPTIONS)
override_dh_fixperms:
dh_fixperms

7
debian/shim.install vendored
View File

@ -1,3 +1,4 @@
/boot/efi/EFI/ubuntu/shim*.efi /usr/lib/shim
/boot/efi/EFI/ubuntu/mm*.efi.signed /usr/lib/shim
/boot/efi/EFI/ubuntu/fb*.efi.signed /usr/lib/shim
/boot/efi/EFI/*/shim*.efi /usr/lib/shim
/boot/efi/EFI/*/mm*.efi /usr/lib/shim
/boot/efi/EFI/*/fb*.efi /usr/lib/shim
/boot/efi/EFI/*/BOOT*.CSV /usr/lib/shim