Rename all the packages containg the helper binaries

Remove potential confusion with shim-signed. We will now end up with
shim-helpers-$arch-signed to make it clear that they just contain the
helper binaries (fb.efi and mm.efi)
This commit is contained in:
Steve McIntyre 2019-03-06 22:28:28 +00:00
parent d71a71f4e7
commit ba30131daf
12 changed files with 19 additions and 18 deletions

3
debian/changelog vendored
View File

@ -15,8 +15,9 @@ shim (15+1533136590.3beb971-3) UNRELEASED; urgency=medium
[ Steve McIntyre ] [ Steve McIntyre ]
* Change maintenance address to be the EFI team * Change maintenance address to be the EFI team
* Add me and vorlon to the Uploaders list * Add me and vorlon to the Uploaders list
* Rename the helper binary packages to shim-helpers-$arch.
-- Luca Boccassi <bluca@debian.org> Fri, 15 Feb 2019 19:50:10 +0000 -- Steve McIntyre <93sam@debian.org> Wed, 06 Mar 2019 22:35:52 +0000
shim (15+1533136590.3beb971-2) unstable; urgency=medium shim (15+1533136590.3beb971-2) unstable; urgency=medium

12
debian/control vendored
View File

@ -20,23 +20,23 @@ Description: boot loader to chain-load signed boot loaders under Secure Boot
infrequently-changing binary to be signed by the UEFI CA, while allowing infrequently-changing binary to be signed by the UEFI CA, while allowing
an OS distributor to revision their main bootloader independently of the CA. an OS distributor to revision their main bootloader independently of the CA.
Package: shim-amd64-signed-template Package: shim-helpers-amd64-signed-template
Architecture: amd64 Architecture: amd64
Depends: ${misc:Depends}, Depends: ${misc:Depends},
Description: boot loader to chain-load signed boot loaders (signing template) Description: boot loader to chain-load signed boot loaders (signing template)
This package contains template files for shim-amd64-signed. This package contains template files for shim-helpers-amd64-signed.
This is only needed for Secure Boot signing. This is only needed for Secure Boot signing.
Package: shim-i386-signed-template Package: shim-helpers-i386-signed-template
Architecture: i386 Architecture: i386
Depends: ${misc:Depends}, Depends: ${misc:Depends},
Description: boot loader to chain-load signed boot loaders (signing template) Description: boot loader to chain-load signed boot loaders (signing template)
This package contains template files for shim-i386-signed. This package contains template files for shim-helpers-i386-signed.
This is only needed for Secure Boot signing. This is only needed for Secure Boot signing.
Package: shim-arm64-signed-template Package: shim-helpers-arm64-signed-template
Architecture: arm64 Architecture: arm64
Depends: ${misc:Depends}, Depends: ${misc:Depends},
Description: boot loader to chain-load signed boot loaders (signing template) Description: boot loader to chain-load signed boot loaders (signing template)
This package contains template files for shim-arm64-signed. This package contains template files for shim-helpers-arm64-signed.
This is only needed for Secure Boot signing. This is only needed for Secure Boot signing.

View File

@ -1 +0,0 @@
shim-amd64-signed-template: missing-dep-for-interpreter

View File

@ -1 +0,0 @@
shim-arm64-signed-template: missing-dep-for-interpreter

View File

@ -0,0 +1 @@
shim-helpers-amd64-signed-template: missing-dep-for-interpreter

View File

@ -0,0 +1 @@
shim-helpers-arm64-signed-template: missing-dep-for-interpreter

View File

@ -0,0 +1 @@
shim-helpers-i386-signed-template: missing-dep-for-interpreter

View File

@ -1 +0,0 @@
shim-i386-signed-template: missing-dep-for-interpreter

View File

@ -20,7 +20,7 @@ subst () {
} }
template='./debian/signing-template' template='./debian/signing-template'
pkg_name="shim-${DEB_HOST_ARCH}-signed-template" pkg_name="shim-helpers-${DEB_HOST_ARCH}-signed-template"
pkg_dir="debian/${pkg_name}/usr/share/code-signing/${pkg_name}" pkg_dir="debian/${pkg_name}/usr/share/code-signing/${pkg_name}"
pkg_deb="${pkg_dir}/source-template/debian" pkg_deb="${pkg_dir}/source-template/debian"

View File

@ -1,10 +1,10 @@
shim-@arch@-signed (1+@version_mangled@) @distribution@; urgency=@urgency@ shim-helpers-@arch@-signed (1+@version_mangled@) @distribution@; urgency=@urgency@
* Update to shim @version_binary@ * Update to shim @version_binary@
-- Debian signing service <ftpmaster@debian.org> @date@ -- Debian signing service <ftpmaster@debian.org> @date@
shim-@arch@-signed (1) unstable; urgency=medium shim-helpers-@arch@-signed (1) unstable; urgency=medium
* Add template source package for signing * Add template source package for signing

View File

@ -1,14 +1,14 @@
Source: shim-@arch@-signed Source: shim-helpers-@arch@-signed
Section: admin Section: admin
Priority: optional Priority: optional
Maintainer: Steve Langasek <vorlon@debian.org> Maintainer: Debian EFI team <efi-team@lists.debian.org>
Standards-Version: 3.9.8 Standards-Version: 4.3.0
Build-Depends: debhelper (>= 10.1~), Build-Depends: debhelper (>= 10.1~),
sbsigntool [amd64 arm64 i386], sbsigntool [amd64 arm64 i386],
shim-unsigned (= @version_binary@), shim-unsigned (= @version_binary@),
Rules-Requires-Root: no Rules-Requires-Root: no
Package: shim-@arch@-signed Package: shim-helpers-@arch@-signed
Architecture: @arch@ Architecture: @arch@
Conflicts: shim (<< 15+1533136590.3beb971-3~), Conflicts: shim (<< 15+1533136590.3beb971-3~),
Replaces: shim (<< 15+1533136590.3beb971-3~), Replaces: shim (<< 15+1533136590.3beb971-3~),

View File

@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Comment: Comment:
This file describes only the shim-signed source package. This file describes only the shim-helpers-signed-* source package.
Files: debian/signatures/* Files: debian/signatures/*
License: public-domain License: public-domain