diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 11 | ||||
| -rwxr-xr-x | debian/rules | 5 |
4 files changed, 29 insertions, 2 deletions
@@ -9,6 +9,8 @@ check: 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 clean: rm -rf build diff --git a/debian/changelog b/debian/changelog index 8ed97bf..5a8ce2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +shim-signed (1.28+nmu2) unstable; urgency=medium + + * Non-maintainer upload. + * Copy the helper binaries from the shim binary so that we no longer + need to depend on it. See #922179 for more details. Add a Replaces: + shim and to allow us to over-write binaries there. + * Explicitly uploading in a chroot with older binaries installed for + shim and sbsigntool, and update Build-Depends to point to those + speficic versions. This package will *not* function with other + versions installed. + + -- Steve McIntyre <93sam@debian.org> Sun, 03 Mar 2019 22:33:41 +0000 + shim-signed (1.28+nmu1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index dfd26bd..38940f5 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,19 @@ Source: shim-signed Section: utils Priority: optional Maintainer: Steve Langasek <vorlon@debian.org> -Build-Depends: debhelper (>= 9), shim, sbsigntool (>= 0.6-0ubuntu4), po-debconf +Build-Depends: debhelper (>= 9), +# Need shim version 0.9+1474479173.6c180c6-1 so we can check the +# signature on the right version of shim + shim (= 0.9+1474479173.6c180c6-1), +# sbsigntool version 0.6-3.2 (newer versions do different things with +# padding and the signatures don't match correctly) + sbsigntool (= 0.6-3.2), po-debconf Standards-Version: 3.9.4 Package: shim-signed Architecture: amd64 -Depends: ${misc:Depends}, shim (= ${shim:Version}), grub-efi-amd64-bin, grub2-common (>= 2.02~beta2-36ubuntu12), mokutil +Depends: ${misc:Depends}, grub-efi-amd64-bin, grub2-common (>= 2.02~beta2-36ubuntu12), mokutil +Replaces: shim (= ${shim:Version}) Recommends: secureboot-db Built-Using: shim (= ${shim:Version}) Description: Secure Boot chain-loading bootloader (Microsoft-signed binary) diff --git a/debian/rules b/debian/rules index 418ca9c..7b6ee17 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,11 @@ SHIM_VERSION := $(shell dpkg-query -f '$${Version}\n' -W shim) docdir := debian/shim-signed/usr/share/doc/shim-signed +override_dh_install: + dh_install + cp /usr/lib/shim/fbx64.efi.signed debian/shim-signed/usr/lib/shim + cp /usr/lib/shim/mmx64.efi.signed debian/shim-signed/usr/lib/shim + override_dh_installchangelogs: dh_installchangelogs # Quieten lintian, which otherwise gets confused by our odd version |