Skip to content

Commit

Permalink
trivial: debian: split up EFI binaries into their own packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Mario Limonciello committed Oct 28, 2019
1 parent 6249637 commit 88623a9
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 6 deletions.
14 changes: 14 additions & 0 deletions contrib/debian/control.in
Expand Up @@ -31,6 +31,7 @@ Package: fwupd
Architecture: linux-any
Depends: ${misc:Depends},
${shlibs:Depends},
fwupd-unsigned (= ${binary:Version}) [amd64 arm64 armhf i386],
shared-mime-info
Recommends: python3,
bolt,
Expand Down Expand Up @@ -125,6 +126,19 @@ Description: GObject introspection data for libfwupd
It can be used by packages using the GIRepository format to generate
dynamic bindings.

Package: fwupd-unsigned
Architecture: amd64 i386 armhf arm64
Depends: ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: same
Description: Firmware update daemon (EFI binaries)
fwupd is a daemon to allow session software to update device firmware.
You can either use a GUI software manager like GNOME Software to view and
apply updates, the command-line tool or the system D-Bus interface directly.
Firmware updates are supported for a variety of technologies.
See <https://github.com/fwupd/fwupd> for details
.
This package provides the EFI binaries.

Package: fwupd-amd64-signed-template
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, make | build-essential | dpkg-dev
Expand Down
2 changes: 2 additions & 0 deletions contrib/debian/fwupd-unsigned.install
@@ -0,0 +1,2 @@
debian/lintian/fwupd-unsigned usr/share/lintian/overrides

3 changes: 0 additions & 3 deletions contrib/debian/lintian/fwupd
Expand Up @@ -4,7 +4,4 @@ fwupd binary: systemd-service-file-missing-install-key lib/systemd/system/fwupd.
fwupd binary: systemd-service-file-missing-install-key lib/systemd/system/system-update.target.wants/fwupd-offline-update.service
#see debian bug 896012
fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_upower.so
#EFI applications are PE executables
fwupd: executable-not-elf-or-script usr/lib/fwupd/efi/*.efi
fwupd: portable-executable-missing-security-features usr/lib/fwupd/efi/*.efi SafeSEH
fwupd: library-not-linked-against-libc usr/lib/*/fwupd-plugins-3/libfu_plugin_modem_manager.so
4 changes: 4 additions & 0 deletions contrib/debian/lintian/fwupd-unsigned
@@ -0,0 +1,4 @@
#EFI applications are PE executables
fwupd-unsigned: executable-not-elf-or-script usr/lib/fwupd/efi/*.efi
fwupd-unsigned: portable-executable-missing-security-features usr/lib/fwupd/efi/*.efi SafeSEH

2 changes: 1 addition & 1 deletion contrib/debian/rules
Expand Up @@ -56,7 +56,7 @@ override_dh_install:
dh_install
#install the EFI binaries if needed
if [ -d debian/tmp/usr/lib/fwupd/efi/ ]; then \
dh_install -pfwupd usr/lib/fwupd/efi ;\
dh_install -pfwupd-unsigned usr/lib/fwupd/efi ;\
dh_install -pfwupd usr/lib/fwupd/fwupdate; \
fi
#if build with meson subproject in CI need to install this too
Expand Down
4 changes: 2 additions & 2 deletions contrib/debian/signing-template/control
Expand Up @@ -2,7 +2,7 @@ Source: fwupd-SIGNARCH-signed
Priority: optional
Maintainer: Debian EFI <debian-efi@lists.debian.org>
Uploaders: Daniel Jared Dominguez <jared.dominguez@dell.com>, Steve McIntyre <93sam@debian.org>, Mario Limonciello <mario.limonciello@dell.com>
Build-Depends: debhelper (>= 9.0.0), sbsigntool [amd64 arm64 armhf i386], fwupd (= SIGNVERSION) [SIGNARCH]
Build-Depends: debhelper (>= 9.0.0), sbsigntool [amd64 arm64 armhf i386], fwupd-unsigned (= SIGNVERSION) [SIGNARCH]
Standards-Version: 4.1.3
Section: libs
Homepage: https://github.com/fwupd/fwupd
Expand All @@ -13,7 +13,7 @@ Package: fwupd-SIGNARCH-signed
Section: admin
Architecture: SIGNARCH
Provides: fwupd-signed
Depends: ${shlibs:Depends}, ${misc:Depends}, fwupd (= SIGNVERSION)
Depends: ${shlibs:Depends}, ${misc:Depends}, fwupd-unsigned (= SIGNVERSION)
Built-Using: fwupd (= SIGNVERSION)
Description: Tools to manage UEFI firmware updates (signed)
fwupd provides functionality to update system firmware. It has been
Expand Down

0 comments on commit 88623a9

Please sign in to comment.