debian/patches/second-stage-path: dropped; the default loader path now includes an arch suffix.

This commit is contained in:
Mathieu Trudel-Lapierre 2017-08-29 13:57:22 -04:00
parent 0123496a8a
commit cff1facf80
2 changed files with 2 additions and 3 deletions

4
debian/changelog vendored
View File

@ -5,10 +5,10 @@ shim (12+1503074702.5202f80-0ubuntu1) UNRELEASED; urgency=medium
* debian/rules: * debian/rules:
- Update dh_auto_build/dh_auto_clean for new upstream options: set - Update dh_auto_build/dh_auto_clean for new upstream options: set
MAKELEVEL. MAKELEVEL.
- Set DEFAULT_LOADER; this makes second-stage-path unnecessary.
- Define an EFI_ARCH variable, and use that for paths to shim. This - Define an EFI_ARCH variable, and use that for paths to shim. This
makes it possible to build a shim for other architectures than amd64. makes it possible to build a shim for other architectures than amd64.
* debian/patches/second-stage-path: dropped. * debian/patches/second-stage-path: dropped; the default loader path now
includes an arch suffix.
* debian/patches/sbsigntool-no-pesign: refreshed. * debian/patches/sbsigntool-no-pesign: refreshed.
* debian/patches/0001-shim-fix-the-mirroring-MokSBState-fail.patch: dropped, * debian/patches/0001-shim-fix-the-mirroring-MokSBState-fail.patch: dropped,
included upstream. included upstream.

1
debian/rules vendored
View File

@ -23,7 +23,6 @@ override_dh_auto_build:
dh_auto_build -- \ dh_auto_build -- \
MAKELEVEL=0 \ MAKELEVEL=0 \
EFI_PATH=/usr/lib \ EFI_PATH=/usr/lib \
DEFAULT_LOADER='\\\\grub$(EFI_ARCH).efi' \
VENDOR_CERT_FILE=$(cert) VENDOR_CERT_FILE=$(cert)
override_dh_fixperms: override_dh_fixperms: