diff -Nru fwupdate-signed-1.8/debian/changelog fwupdate-signed-1.11/debian/changelog --- fwupdate-signed-1.8/debian/changelog 2016-03-17 20:34:02.000000000 +0000 +++ fwupdate-signed-1.11/debian/changelog 2016-03-20 23:33:21.000000000 +0000 @@ -1,3 +1,28 @@ +fwupdate-signed (1.11) xenial; urgency=medium + + * Really build depends on 0.5-2ubuntu4 + + -- Mario Limonciello Sun, 20 Mar 2016 18:33:07 -0500 + +fwupdate-signed (1.10) xenial; urgency=medium + + * Use DPKG_MAINTSCRIPT_ARCH in postrm to identify architecture instead of + dpkg-architecture. + * Hardcode EFIDIR into postrm at build time. + * Build depends fwupdate 0.5-2ubuntu4 + * Drop build-depends on lsb-release + + -- Mario Limonciello Sun, 20 Mar 2016 14:13:27 -0500 + +fwupdate-signed (1.9) xenial; urgency=medium + + * Various arch packages aren't coinstallable (and neither is dependency fwupdate). + Move over to fwupdate-signed package for each arch (LP: #1559578) + * Add a postrm for fwupdate-signed. + * Build depends on fwupdate 0.5-2ubuntu3 + + -- Mario Limonciello Sun, 20 Mar 2016 10:25:11 -0500 + fwupdate-signed (1.8) xenial; urgency=medium * Add support for i386, armhf, arm64. diff -Nru fwupdate-signed-1.8/debian/clean fwupdate-signed-1.11/debian/clean --- fwupdate-signed-1.8/debian/clean 1970-01-01 00:00:00.000000000 +0000 +++ fwupdate-signed-1.11/debian/clean 2016-03-20 19:21:31.000000000 +0000 @@ -0,0 +1 @@ +debian/fwupdate-signed.postrm diff -Nru fwupdate-signed-1.8/debian/control fwupdate-signed-1.11/debian/control --- fwupdate-signed-1.8/debian/control 2016-03-17 20:31:40.000000000 +0000 +++ fwupdate-signed-1.11/debian/control 2016-03-20 23:33:27.000000000 +0000 @@ -2,62 +2,46 @@ Section: utils Priority: optional Maintainer: Ubuntu Developers -Build-Depends: debhelper (>= 9), lsb-release, python3, python3-apt, fwupdate (>= 0.5-2ubuntu2) +Build-Depends: debhelper (>= 9), python3, python3-apt, fwupdate (>= 0.5-2ubuntu4) Standards-Version: 3.9.6 -Package: fwupdate-amd64-signed -Architecture: amd64 +Package: fwupdate-signed +Architecture: amd64 i386 armhf arm64 +Multi-Arch: foreign Depends: ${misc:Depends}, fwupdate (= ${fwupdate:Version}) -Provides: fwupdate-signed Recommends: secureboot-db Built-Using: fwupdate (= ${fwupdate:Version}) -Description: Linux Firmware Updater EFI binary (EFI-AMD64 version, signed) +Breaks: fwupdate-amd64-signed (<<1.9), fwupdate-i386-signed (<<1.9), fwupdate-arm64-signed (<<1.9), fwupdate-armhf-signed (<<1.9) +Replaces: fwupdate-amd64-signed (<<1.9), fwupdate-i386-signed (<<1.9), fwupdate-arm64-signed (<<1.9), fwupdate-armhf-signed (<<1.9) +Description: Linux Firmware Updater EFI signed binary fwupdate provides functionality to update system firmware. It has been initially designed to update firmware using UEFI capsule updates, but it is designed to be extensible to other firmware update standards. . - This package contains a version of the fwupdate binary built for use with the - EFI-AMD64 architecture, signed with Canonical's UEFI signing key. + This package contains a version of the fwupdate binary signed with + Canonical's UEFI signing key. + +Package: fwupdate-amd64-signed +Architecture: amd64 +Depends: ${misc:Depends}, fwupdate-signed +Description: Linux Firmware Updater EFI binary (EFI-AMD64 version, signed) + This is a transitional package to move to a common fwupdate-signed package Package: fwupdate-i386-signed Architecture: i386 -Depends: ${misc:Depends}, fwupdate (= ${fwupdate:Version}) -Provides: fwupdate-signed -Recommends: secureboot-db -Built-Using: fwupdate (= ${fwupdate:Version}) +Depends: ${misc:Depends}, fwupdate-signed Description: Linux Firmware Updater EFI binary (EFI-I386 version, signed) - fwupdate provides functionality to update system firmware. It has been - initially designed to update firmware using UEFI capsule updates, but - it is designed to be extensible to other firmware update standards. - . - This package contains a version of the fwupdate binary built for use with the - EFI-I386 architecture, signed with Canonical's UEFI signing key. + This is a transitional package to move to a common fwupdate-signed package Package: fwupdate-arm64-signed Architecture: arm64 -Depends: ${misc:Depends}, fwupdate (= ${fwupdate:Version}) -Provides: fwupdate-signed -Recommends: secureboot-db -Built-Using: fwupdate (= ${fwupdate:Version}) +Depends: ${misc:Depends}, fwupdate-signed Description: Linux Firmware Updater EFI binary (EFI-ARM64 version, signed) - fwupdate provides functionality to update system firmware. It has been - initially designed to update firmware using UEFI capsule updates, but - it is designed to be extensible to other firmware update standards. - . - This package contains a version of the fwupdate binary built for use with the - EFI-ARM64 architecture, signed with Canonical's UEFI signing key. + This is a transitional package to move to a common fwupdate-signed package Package: fwupdate-armhf-signed Architecture: armhf Depends: ${misc:Depends}, fwupdate (= ${fwupdate:Version}) -Provides: fwupdate-signed -Recommends: secureboot-db -Built-Using: fwupdate (= ${fwupdate:Version}) Description: Linux Firmware Updater EFI binary (EFI-ARMHF version, signed) - fwupdate provides functionality to update system firmware. It has been - initially designed to update firmware using UEFI capsule updates, but - it is designed to be extensible to other firmware update standards. - . - This package contains a version of the fwupdate binary built for use with the - EFI-ARMHF architecture, signed with Canonical's UEFI signing key. + This is a transitional package to move to a common fwupdate-signed package diff -Nru fwupdate-signed-1.8/debian/fwupdate-amd64-signed.postinst fwupdate-signed-1.11/debian/fwupdate-amd64-signed.postinst --- fwupdate-signed-1.8/debian/fwupdate-amd64-signed.postinst 2016-03-16 04:06:16.000000000 +0000 +++ fwupdate-signed-1.11/debian/fwupdate-amd64-signed.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -case $1 in - configure) - ID=$(lsb_release -is | awk '{ print tolower($0) }') - #install binary to ESP - mkdir -p /boot/efi/EFI/$ID/fw - /usr/lib/fwupdate/install $ID - ;; - -esac - -#DEBHELPER# - -exit 0 diff -Nru fwupdate-signed-1.8/debian/fwupdate-signed.postinst fwupdate-signed-1.11/debian/fwupdate-signed.postinst --- fwupdate-signed-1.8/debian/fwupdate-signed.postinst 1970-01-01 00:00:00.000000000 +0000 +++ fwupdate-signed-1.11/debian/fwupdate-signed.postinst 2016-03-20 13:53:27.000000000 +0000 @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +case $1 in + configure) + /usr/lib/fwupdate/install + ;; + +esac + +#DEBHELPER# + +exit 0 diff -Nru fwupdate-signed-1.8/debian/fwupdate-signed.postrm.in fwupdate-signed-1.11/debian/fwupdate-signed.postrm.in --- fwupdate-signed-1.8/debian/fwupdate-signed.postrm.in 1970-01-01 00:00:00.000000000 +0000 +++ fwupdate-signed-1.11/debian/fwupdate-signed.postrm.in 2016-03-20 19:16:02.000000000 +0000 @@ -0,0 +1,55 @@ +#!/bin/sh +# postrm script for fwupdate-signed +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + EFIDIR=#EFIDIR# + if [ "${DPKG_MAINTSCRIPT_ARCH}" = "amd64" ]; then + EFI_NAME=x64 + elif [ "${DPKG_MAINTSCRIPT_ARCH}" = "i386" ]; then + EFI_NAME=ia32 + elif [ "${DPKG_MAINTSCRIPT_ARCH}" = "arm64" ]; then + EFI_NAME=aa64 + elif [ "${DPKG_MAINTSCRIPT_ARCH}" = "armhf" ]; then + EFI_NAME=arm + fi + + #remove binary that was installed by us, but if fwupdate + #unsigned is still installed, reinstall that binary + rm -f /boot/efi/EFI/$EFIDIR/fwup$EFI_NAME.efi + if [ -f /usr/lib/fwupdate/install ]; then + /usr/lib/fwupdate/install + fi + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru fwupdate-signed-1.8/debian/rules fwupdate-signed-1.11/debian/rules --- fwupdate-signed-1.8/debian/rules 2015-11-02 17:59:55.000000000 +0000 +++ fwupdate-signed-1.11/debian/rules 2016-03-20 19:18:26.000000000 +0000 @@ -2,11 +2,13 @@ include /usr/share/dpkg/default.mk +EFIDIR ?= $(shell dpkg-vendor --query vendor | awk '{ print tolower($$0) }') + %: dh $@ -destdir := debian/fwupdate-$(DEB_HOST_ARCH)-signed -docdir := $(destdir)/usr/share/doc/fwupdate-$(DEB_HOST_ARCH)-signed +destdir := debian/fwupdate-signed +docdir := $(destdir)/usr/share/doc/fwupdate-signed override_dh_installchangelogs: dh_installchangelogs @@ -19,5 +21,7 @@ -Vfwupdate:Version=$(shell cat version) override_dh_auto_install: + sed 's,#EFIDIR#,$(EFIDIR),' \ + debian/fwupdate-signed.postrm.in > debian/fwupdate-signed.postrm dh_auto_install --destdir=$(destdir)