From ba30131daf873423e80c6b1dc484b813f40be1bf Mon Sep 17 00:00:00 2001 From: Steve McIntyre Date: Wed, 6 Mar 2019 22:28:28 +0000 Subject: [PATCH] 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) --- debian/changelog | 3 ++- debian/control | 12 ++++++------ debian/shim-amd64-signed-template.lintian-overrides | 1 - debian/shim-arm64-signed-template.lintian-overrides | 1 - ...m-helpers-amd64-signed-template.lintian-overrides | 1 + ...m-helpers-arm64-signed-template.lintian-overrides | 1 + ...im-helpers-i386-signed-template.lintian-overrides | 1 + debian/shim-i386-signed-template.lintian-overrides | 1 - debian/signing-template.generate | 2 +- debian/signing-template/changelog.in | 4 ++-- debian/signing-template/control.in | 8 ++++---- debian/signing-template/copyright | 2 +- 12 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 debian/shim-amd64-signed-template.lintian-overrides delete mode 100644 debian/shim-arm64-signed-template.lintian-overrides create mode 100644 debian/shim-helpers-amd64-signed-template.lintian-overrides create mode 100644 debian/shim-helpers-arm64-signed-template.lintian-overrides create mode 100644 debian/shim-helpers-i386-signed-template.lintian-overrides delete mode 100644 debian/shim-i386-signed-template.lintian-overrides diff --git a/debian/changelog b/debian/changelog index 6dc54b7..c0d0ab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,9 @@ shim (15+1533136590.3beb971-3) UNRELEASED; urgency=medium [ Steve McIntyre ] * Change maintenance address to be the EFI team * Add me and vorlon to the Uploaders list + * Rename the helper binary packages to shim-helpers-$arch. - -- Luca Boccassi 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 diff --git a/debian/control b/debian/control index e713ee2..bedff82 100644 --- a/debian/control +++ b/debian/control @@ -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 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 Depends: ${misc:Depends}, 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. -Package: shim-i386-signed-template +Package: shim-helpers-i386-signed-template Architecture: i386 Depends: ${misc:Depends}, 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. -Package: shim-arm64-signed-template +Package: shim-helpers-arm64-signed-template Architecture: arm64 Depends: ${misc:Depends}, 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. diff --git a/debian/shim-amd64-signed-template.lintian-overrides b/debian/shim-amd64-signed-template.lintian-overrides deleted file mode 100644 index 96e97d2..0000000 --- a/debian/shim-amd64-signed-template.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -shim-amd64-signed-template: missing-dep-for-interpreter diff --git a/debian/shim-arm64-signed-template.lintian-overrides b/debian/shim-arm64-signed-template.lintian-overrides deleted file mode 100644 index a5478bb..0000000 --- a/debian/shim-arm64-signed-template.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -shim-arm64-signed-template: missing-dep-for-interpreter diff --git a/debian/shim-helpers-amd64-signed-template.lintian-overrides b/debian/shim-helpers-amd64-signed-template.lintian-overrides new file mode 100644 index 0000000..e894fa9 --- /dev/null +++ b/debian/shim-helpers-amd64-signed-template.lintian-overrides @@ -0,0 +1 @@ +shim-helpers-amd64-signed-template: missing-dep-for-interpreter diff --git a/debian/shim-helpers-arm64-signed-template.lintian-overrides b/debian/shim-helpers-arm64-signed-template.lintian-overrides new file mode 100644 index 0000000..adb0fa9 --- /dev/null +++ b/debian/shim-helpers-arm64-signed-template.lintian-overrides @@ -0,0 +1 @@ +shim-helpers-arm64-signed-template: missing-dep-for-interpreter diff --git a/debian/shim-helpers-i386-signed-template.lintian-overrides b/debian/shim-helpers-i386-signed-template.lintian-overrides new file mode 100644 index 0000000..8833480 --- /dev/null +++ b/debian/shim-helpers-i386-signed-template.lintian-overrides @@ -0,0 +1 @@ +shim-helpers-i386-signed-template: missing-dep-for-interpreter diff --git a/debian/shim-i386-signed-template.lintian-overrides b/debian/shim-i386-signed-template.lintian-overrides deleted file mode 100644 index 41935bf..0000000 --- a/debian/shim-i386-signed-template.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -shim-i386-signed-template: missing-dep-for-interpreter diff --git a/debian/signing-template.generate b/debian/signing-template.generate index cc842c1..63ba0f2 100755 --- a/debian/signing-template.generate +++ b/debian/signing-template.generate @@ -20,7 +20,7 @@ subst () { } 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_deb="${pkg_dir}/source-template/debian" diff --git a/debian/signing-template/changelog.in b/debian/signing-template/changelog.in index ca666d7..f2e4ba6 100644 --- a/debian/signing-template/changelog.in +++ b/debian/signing-template/changelog.in @@ -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@ -- Debian signing service @date@ -shim-@arch@-signed (1) unstable; urgency=medium +shim-helpers-@arch@-signed (1) unstable; urgency=medium * Add template source package for signing diff --git a/debian/signing-template/control.in b/debian/signing-template/control.in index a352242..960d009 100644 --- a/debian/signing-template/control.in +++ b/debian/signing-template/control.in @@ -1,14 +1,14 @@ -Source: shim-@arch@-signed +Source: shim-helpers-@arch@-signed Section: admin Priority: optional -Maintainer: Steve Langasek -Standards-Version: 3.9.8 +Maintainer: Debian EFI team +Standards-Version: 4.3.0 Build-Depends: debhelper (>= 10.1~), sbsigntool [amd64 arm64 i386], shim-unsigned (= @version_binary@), Rules-Requires-Root: no -Package: shim-@arch@-signed +Package: shim-helpers-@arch@-signed Architecture: @arch@ Conflicts: shim (<< 15+1533136590.3beb971-3~), Replaces: shim (<< 15+1533136590.3beb971-3~), diff --git a/debian/signing-template/copyright b/debian/signing-template/copyright index 6d325cb..955ccbf 100644 --- a/debian/signing-template/copyright +++ b/debian/signing-template/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Comment: - This file describes only the shim-signed source package. + This file describes only the shim-helpers-signed-* source package. Files: debian/signatures/* License: public-domain