diff -Nru fwupdate-12/debian/changelog fwupdate-12/debian/changelog --- fwupdate-12/debian/changelog 2019-02-05 19:59:52.000000000 +0000 +++ fwupdate-12/debian/changelog 2019-12-19 17:33:29.000000000 +0000 @@ -1,12 +1,57 @@ -fwupdate (12-3bionic2) bionic; urgency=medium +fwupdate (12-7~ubuntu18.04.3) bionic; urgency=medium - * Backport to Ubuntu 18.04 - - Fixes BIOS update on some AMI BIOS where the capsule descriptor length - is not properly calculated (LP: #1785165) - * Drop signed template packages, only used in Debian. - * Re-enable the signed archive used in Ubuntu 18.04. + * control: Drop Breaks on libfwup{1,-dev}. (LP: #1820768) - -- Mario Limonciello Tue, 05 Feb 2019 13:59:48 -0600 + -- Timo Aaltonen Thu, 19 Dec 2019 19:33:29 +0200 + +fwupdate (12-7~ubuntu18.04.2) bionic; urgency=medium + + * preinst: Be more thorough when cleaning old files from fwupdate-signed. + * control: Add fwupdate-signed as a transitional package and drop it from + fwupdate Breaks. (LP: #1820768) + + -- Timo Aaltonen Thu, 19 Dec 2019 10:46:26 +0200 + +fwupdate (12-7~ubuntu18.04.1) bionic; urgency=medium + + * Backport to bionic for migration to fwupd. (LP: #1820768) + + -- Timo Aaltonen Fri, 25 Oct 2019 11:27:56 +0300 + +fwupdate (12-7) unstable; urgency=medium + + * Add a preinst script to clean up extra file from usage. (Closes: #939604) + + -- Mario Limonciello Fri, 06 Sep 2019 17:20:42 -0500 + +fwupdate (12-6) unstable; urgency=medium + + * Convert package into a transition package (Closes: #925688) + + -- Mario Limonciello Wed, 04 Sep 2019 11:54:50 -0500 + +fwupdate (12-5) unstable; urgency=medium + + [ Steve McIntyre ] + * Add Built-Using for the fwupdate-*-signed packages. Closes: #932756 + + -- Steve McIntyre <93sam@debian.org> Mon, 22 Jul 2019 17:31:50 -0300 + +fwupdate (12-4) unstable; urgency=medium + + [ Steve McIntyre ] + * debian/gen_signing_json: Update the format of the json metadata to + match new requirements: + + Move all the data under a new top-level "packages" key + + Add an empty "trusted_certs" key - our binaries do not do any + further verification with an embedded key. + + [ Mario Limonciello ] + * Install signed packages for secure boot automatically + * Use a virtual package fwupdate-signed to resolve the correct package + * Stop producing UEFI archive for Ubuntu signed images (LP: #1787254) + + -- Steve McIntyre <93sam@debian.org> Mon, 25 Mar 2019 00:47:29 +0000 fwupdate (12-3) unstable; urgency=medium diff -Nru fwupdate-12/debian/clean fwupdate-12/debian/clean --- fwupdate-12/debian/clean 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/clean 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -linux/cleanup -linux/cleanup.service -debian/fwupdate.postrm -debian/fwupdate.postinst diff -Nru fwupdate-12/debian/control fwupdate-12/debian/control --- fwupdate-12/debian/control 2019-02-05 16:50:51.000000000 +0000 +++ fwupdate-12/debian/control 2019-12-19 17:32:54.000000000 +0000 @@ -2,47 +2,28 @@ Priority: optional Maintainer: Debian EFI Uploaders: Daniel Jared Dominguez , Steve McIntyre <93sam@debian.org>, Mario Limonciello -Build-Depends: debhelper (>= 9.0.0), pkg-config, libpopt-dev, libefivar-dev (>= 34), libefiboot-dev (>= 34), gnu-efi (>= 3.0.2), elfutils, libsmbios-dev [amd64 i386] +Build-Depends: debhelper (>= 9.0.0) Standards-Version: 4.1.3 Section: libs Homepage: https://github.com/rhinstaller/fwupdate Vcs-Git: https://salsa.debian.org/efi-team/fwupdate.git Vcs-Browser: https://salsa.debian.org/efi-team/fwupdate -Package: libfwup-dev -Section: libdevel -Architecture: amd64 i386 armhf arm64 -Multi-Arch: same -Depends: libfwup1 (= ${binary:Version}), ${misc:Depends}, libefivar-dev (>= 0.16) -Description: Development headers for libfwup - 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 provides development headers required to use libfwup. - Package: fwupdate Section: admin Architecture: amd64 i386 armhf arm64 -Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, libfwup1 (= ${binary:Version}), efibootmgr, e2fsprogs -Recommends: fwupdate-signed -Description: Tools to manage UEFI firmware updates - 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 provides a simple command line interface to perform UEFI - firmware updates. +Breaks: fwupdate-amd64-signed-template (<< 12-5), + fwupdate-i386-signed-template (<< 12-5), + fwupdate-armhf-signed-template (<< 12-5), + fwupdate-arm64-signed-template (<< 12-5), +Depends: fwupd +Description: Transitional package for fwupd + This is a transitional package to move users of fwupdate 12-5 or earlier to fuwpd. -Package: libfwup1 +Package: fwupdate-signed +Section: oldlibs Architecture: amd64 i386 armhf arm64 -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Library to manage UEFI firmware updates - 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 library is to allow for the simple manipulation of UEFI firmware updates. +Depends: fwupd-signed +Description: Transitional package for fwupd + This is a transitional package to move users of fwupdate-signed to + fuwpd-signed. diff -Nru fwupdate-12/debian/docs fwupdate-12/debian/docs --- fwupdate-12/debian/docs 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -TODO diff -Nru fwupdate-12/debian/fwupdate.dirs fwupdate-12/debian/fwupdate.dirs --- fwupdate-12/debian/fwupdate.dirs 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/fwupdate.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -var/lib/fwupdate diff -Nru fwupdate-12/debian/fwupdate.install fwupdate-12/debian/fwupdate.install --- fwupdate-12/debian/fwupdate.install 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/fwupdate.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh - -bindir=usr/bin -datadir=usr/share -mandir=${datadir}/man -libdir=usr/lib - -echo "${bindir}"/fwupdate -echo boot/efi/EFI/*/fwup*.efi /usr/lib/fwupdate/ -echo "${datadir}"/locale/en/\*.po -echo "${mandir}"/man1/\* -echo "${mandir}"/man3/\* -echo "${libdir}"/fwupdate/* -echo "${libdir}"/systemd/* /lib/systemd -echo "debian/lintian/fwupdate" /usr/share/lintian/overrides diff -Nru fwupdate-12/debian/fwupdate.postinst.in fwupdate-12/debian/fwupdate.postinst.in --- fwupdate-12/debian/fwupdate.postinst.in 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/fwupdate.postinst.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -#!/bin/sh -# postinst script for fwupdate -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - # in between 0.4 and 0.5 release, upstream renamed - #the binary that was installed to the ESP. - if dpkg --compare-versions "$2" lt "0.4-6"; then - EFIDIR=#EFIDIR# - if [ -f /boot/efi/EFI/$EFIDIR/fwupdate.efi ]; then - rm -f /boot/efi/EFI/$EFIDIR/fwupdate.efi - fi - fi - # older versions were missing lsb_release in dependencies - # correct wrongly created directories - if dpkg --compare-versions "$2" lt "0.5-2"; then - if [ -d /boot/efi/EFI/fw ]; then - rmdir --parents --ignore-fail-on-non-empty /boot/efi/EFI/fw - fi - fi - - #install binary to ESP - /usr/lib/fwupdate/install - - #cleanup from other potential installs - #this is actually a systemd static service. - #I would have done it with dh-systemd, but deb-systemd-invoke - #won't run static services in postinst. - /usr/lib/fwupdate/cleanup || true - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst 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-12/debian/fwupdate.postrm.in fwupdate-12/debian/fwupdate.postrm.in --- fwupdate-12/debian/fwupdate.postrm.in 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/fwupdate.postrm.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -#!/bin/sh -# postrm script for fwupdate -# -# 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 - remove|upgrade|purge) - #moved in v10 /var/cache/fwupdate -> /var/lib/fwupdate - rm -f /var/cache/fwupdate/done - ;; - 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 - - rm -f /boot/efi/EFI/$EFIDIR/fwup$EFI_NAME.efi - if [ -d /boot/efi/EFI/$EFIDIR/fw ]; then - rmdir --parents --ignore-fail-on-non-empty /boot/efi/EFI/$EFIDIR/fw - 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-12/debian/libfwup1.install fwupdate-12/debian/libfwup1.install --- fwupdate-12/debian/libfwup1.install 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/libfwup1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -#!/bin/sh - -libdir=usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) - -echo "${libdir}"/\*.so.\* diff -Nru fwupdate-12/debian/libfwup-dev.install fwupdate-12/debian/libfwup-dev.install --- fwupdate-12/debian/libfwup-dev.install 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/libfwup-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#!/bin/sh - -includedir=usr/include -libdir=usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) - -echo "${includedir}"/\* -echo "${libdir}"/\*.so -echo "${libdir}"/pkgconfig/\*.pc diff -Nru fwupdate-12/debian/lintian/fwupdate fwupdate-12/debian/lintian/fwupdate --- fwupdate-12/debian/lintian/fwupdate 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/lintian/fwupdate 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#this is intended, it will be started by the postinst script -fwupdate binary: systemd-service-file-missing-install-key diff -Nru fwupdate-12/debian/patches/0001-efi-Fix-build-on-armhf.patch fwupdate-12/debian/patches/0001-efi-Fix-build-on-armhf.patch --- fwupdate-12/debian/patches/0001-efi-Fix-build-on-armhf.patch 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/patches/0001-efi-Fix-build-on-armhf.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -From 4c5767b7cd28e43318031ed652c00fc758a4c42e Mon Sep 17 00:00:00 2001 -From: Mario Limonciello -Date: Sat, 4 Aug 2018 23:06:33 -0500 -Subject: [PATCH] efi: Fix build on armhf - -Debian & Ubuntu are FTBFS currently for armhf with this error: -$ arm-linux-gnueabihf-gcc -nostdlib -Wl,--warn-common -Wl,--no-undefined -Wl,--fatal-warnings -Wl,-shared -Wl,-Bsymbolic -L/usr/lib -L/usr/lib -Wl,--build-id=sha1 -Wl,--hash-style=sysv /usr/lib/crt0-efi-arm.o -Wl,--defsym=EFI_SUBSYSTEM=0xa -o fakeesrt2.so fakeesrt2.o -lefi -lgnuefi \ - /usr/lib/gcc/arm-linux-gnueabihf/8/libgcc.a " " \ - -T elf_arm_efi.lds -arm-linux-gnueabihf-gcc: error: : No such file or directory - -This is caused by a missing $ in the "sed" command for switching in -libgcc_eh. - -However there is also a secondary problem in that the build is run -with -fexceptions which doesn't work for armhf. - -It fails with this: - -$ arm-linux-gnueabihf-gcc -nostdlib -Wl,--warn-common -Wl,--no-undefined -Wl,--fatal-warnings -Wl,-shared -Wl,-Bsymbolic -L/usr/lib -L/usr/lib -Wl,--build-id=sha1 -Wl,--hash-style=sysv /usr/lib/crt0-efi-arm.o -Wl,--defsym=EFI_SUBSYSTEM=0xa -o fakeesrt2.so fakeesrt2.o -lefi -lgnuefi \ - /usr/lib/gcc-cross/arm-linux-gnueabihf/7/libgcc_eh.a \ - -T elf_arm_efi.lds -/usr/bin/arm-linux-gnueabihf-ld: warning: /usr/lib/gcc-cross/arm-linux-gnueabihf/7/libgcc_eh.a(unwind-arm.o) uses 4-byte wchar_t yet the output is to use 2-byte wchar_t; use of wchar_t values across objects may fail -/usr/bin/arm-linux-gnueabihf-ld: warning: /usr/lib/gcc-cross/arm-linux-gnueabihf/7/libgcc_eh.a(pr-support.o) uses 4-byte wchar_t yet the output is to use 2-byte wchar_t; use of wchar_t values across objects may fail -/usr/lib/gcc-cross/arm-linux-gnueabihf/7/libgcc_eh.a(unwind-arm.o): In function `get_eit_entry': -(.text+0x154): undefined reference to `__exidx_end' -(.text+0x158): undefined reference to `__exidx_start' -/usr/lib/gcc-cross/arm-linux-gnueabihf/7/libgcc_eh.a(unwind-arm.o): In function `unwind_phase2': -(.text+0x1f0): undefined reference to `abort' -/usr/lib/gcc-cross/arm-linux-gnueabihf/7/libgcc_eh.a(unwind-arm.o): In function `__gnu_Unwind_Resume': -(.text+0x394): undefined reference to `abort' -(.text+0x3ac): undefined reference to `abort' -/usr/lib/gcc-cross/arm-linux-gnueabihf/7/libgcc_eh.a(pr-support.o): In function `_Unwind_GetDataRelBase': -(.text+0x382): undefined reference to `abort' -collect2: error: ld returned 1 exit status -Makefile:114: recipe for target 'fakeesrt2.so' failed -make: *** [fakeesrt2.so] Error 1 -rm fakeesrt2.o ---- - efi/Makefile | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/efi/Makefile b/efi/Makefile -index f4d079e..722dd73 100644 ---- a/efi/Makefile -+++ b/efi/Makefile -@@ -10,7 +10,7 @@ include $(TOP)/Make.rules - VPATH = $(TOP)/efi - - CFLAGS ?= -Og -g3 -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 \ -- -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 \ -+ -fstack-protector-strong --param=ssp-buffer-size=4 \ - -grecord-gcc-switches - BUILDFLAGS := $(CFLAGS) -fpic -Werror -Wall -Wextra -fshort-wchar \ - -Wno-error=missing-field-initializers -Wno-missing-field-initializers \ -@@ -24,9 +24,10 @@ CCLDFLAGS ?= -nostdlib -Wl,--warn-common \ - -Wl,--build-id=sha1 -Wl,--hash-style=sysv \ - $(GNUEFIDIR)/crt0-efi-$(ARCH).o - CLANG_BUGS = $(if $(findstring gcc,$(CC)),-maccumulate-outgoing-args,) --LIBGCC=$(shell $(CC) -print-libgcc-file-name) - ifeq ($(ARCH),arm) --LIBGCC+=" $(shell $(CC) -print-libgcc-file-name | sed 's/\.a$/_eh.a/')" -+LIBGCC=$(shell $(CC) -print-libgcc-file-name | sed 's/\.a$$/_eh.a/') -+else -+LIBGCC=$(shell $(CC) -print-libgcc-file-name) - endif - - define objcopy_version = --- -2.7.4 - diff -Nru fwupdate-12/debian/patches/series fwupdate-12/debian/patches/series --- fwupdate-12/debian/patches/series 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001-efi-Fix-build-on-armhf.patch diff -Nru fwupdate-12/debian/preinst fwupdate-12/debian/preinst --- fwupdate-12/debian/preinst 1970-01-01 00:00:00.000000000 +0000 +++ fwupdate-12/debian/preinst 2019-12-19 08:35:04.000000000 +0000 @@ -0,0 +1,25 @@ +#!/bin/sh +# postrm script for fwupdate +# +# see: dh_installdeb(1) + +set -e + +EFIDIR=$(dpkg-vendor --query vendor | awk '{ print tolower($$0) }') +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 +rm -f /boot/efi/EFI/$EFIDIR/fwup$EFI_NAME.efi +rm -f /var/lib/fwupdate/done +rm -f /var/cache/fwupdate/done +for dir in /boot/efi/EFI/$EFIDIR/fw /var/cache/fwupdate /var/lib/fwupdate; do + if [ -d $dir ]; then + rmdir --parents --ignore-fail-on-non-empty $dir || true + fi +done diff -Nru fwupdate-12/debian/README.Debian fwupdate-12/debian/README.Debian --- fwupdate-12/debian/README.Debian 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -signed vs unsigned fwupdate programs ------------------------------------- - -The tools aren't configured to understand that there is actually a -difference between the signed and unsigned version, only the firmware -will notice this difference when enforcing secure boot. - -The reasoning behind signed/unsigned installation is to be able to -support secure boot, even if the user doesn't have it turned on at -installation time. - -In Ubuntu, both fwupdate-signed and fwupdate are seeded in the default -installation. If the end user installs in legacy mode nothing gets -installed to the ESP. If they install in UEFI mode then the signed -version goes to the ESP (whether or not secure boot is on). If they -turn secure boot on later then they're in good shape. - -When someone installs from a minimal system fwupdate without -fwupdate-signed it will look and see if secure boot is turned on. It -doesn't do them any good to install to the ESP if secure boot is -turned on but fwupdate-signed isn't installed. So rather than cause -the postinst fail on something that is configurable in the BIOS, -display a warning. - -In Debian, the package name for the signed version is slightly -different due to different infrastructure. fwupdate-signed-$ARCH and -fwupdate should both be installed and then things will work similarly -to what's described above. - diff -Nru fwupdate-12/debian/README.source fwupdate-12/debian/README.source --- fwupdate-12/debian/README.source 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -fwupdate for Debian -------------------- - -To build from the git tree, run: - git-buildpackage -us -uc -S -Then, if using sbuild, you can use something like: - sbuild -s -c sid-amd64 -d unstable - - -- Daniel Jared Dominguez Thu, 21 May 2015 13:44:16 -0500 diff -Nru fwupdate-12/debian/rules fwupdate-12/debian/rules --- fwupdate-12/debian/rules 2019-02-05 17:09:30.000000000 +0000 +++ fwupdate-12/debian/rules 2019-09-04 17:08:14.000000000 +0000 @@ -1,68 +1,12 @@ #!/usr/bin/make -f -# -*- makefile -*- -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -EFIDIR ?= $(shell dpkg-vendor --query vendor | awk '{ print tolower($$0) }') -PODATE := $(shell dpkg-parsechangelog --show-field Date | xargs -0 date --utc "+%Y-%m-%d %H:%M%z" --date) - -deb_version := $(shell dpkg-parsechangelog --show-field Version) - -SB_STYLE := debian -ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) - SB_STYLE := ubuntu - tar_name := fwupdate_$(deb_version)_$(DEB_HOST_ARCH).tar.gz -endif - -buildroot := debian/tmp - %: dh $@ override_dh_auto_build: - dh_auto_build -- libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ - libexecdir=\$${prefix}/lib/ \ - datadir=/var/cache/ \ - localedir=/usr/share/locale/ \ - GNUEFIDIR=\$${prefix}/lib \ - CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- \ - EFIDIR=$(EFIDIR) - sed 's,#EFIDIR#,$(EFIDIR),' \ - debian/fwupdate.postrm.in > debian/fwupdate.postrm - sed 's,#EFIDIR#,$(EFIDIR),' \ - debian/fwupdate.postinst.in > debian/fwupdate.postinst - - # This is to satisfy https://wiki.debian.org/ReproducibleBuilds - sed -i 's,POT-Creation-Date:.*,POT-Creation-Date: $(PODATE)\\n",' \ - linux/libfwup.po - sed -i 's,POT-Creation-Date:.*,POT-Creation-Date: $(PODATE)\\n",' \ - linux/fwupdate.po + echo "NO-OP" override_dh_auto_install: - dh_auto_install -- libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ - libexecdir=\$${prefix}/lib/ \ - datadir=/var/cache/ \ - localedir=/usr/share/locale/ \ - GNUEFIDIR=\$${prefix}/lib \ - CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- \ - EFIDIR=$(EFIDIR) - chmod -x ${buildroot}/boot/efi/EFI/$(EFIDIR)/*.efi - mkdir -p ${buildroot}/usr/lib/fwupdate - cp debian/scripts/install.in ${buildroot}/usr/lib/fwupdate/install - sed -i 's,#EFIDIR#,$(EFIDIR),' ${buildroot}/usr/lib/fwupdate/install + echo "NO OP" override_dh_auto_clean: - dh_auto_clean -- EFIDIR=$(EFIDIR) -ifeq (ubuntu,$(SB_STYLE)) - rm -rf debian/fwupdate-images -endif - -override_dh_builddeb: - dh_builddeb -- -Zxz -ifeq (ubuntu,$(SB_STYLE)) - mkdir -p debian/fwupdate-images/$(deb_version) - cp efi/fwup*.efi debian/fwupdate-images/$(deb_version) - echo $(deb_version) \ - > debian/fwupdate-images/$(deb_version)/version - cd debian/fwupdate-images && tar czvf ../../../$(tar_name) . - dpkg-distaddfile $(tar_name) raw-uefi - -endif + echo "NO OP" diff -Nru fwupdate-12/debian/scripts/install.in fwupdate-12/debian/scripts/install.in --- fwupdate-12/debian/scripts/install.in 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/scripts/install.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -#!/bin/sh - -DISTRIBUTOR=#EFIDIR# - -efi_vars_dir=/sys/firmware/efi/vars -EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c -SB="$efi_vars_dir/SecureBoot-$EFI_GLOBAL_VARIABLE/data" - -#if we have SB enabled, don't bother to install the unsigned file -if [ -e "$SB" ] && \ - [ "$(( $(printf 0x%x \'"$(cat "$SB" | cut -b1)") & 1 ))" = 1 ]; then - SECURE_BOOT="1" -fi - -if [ ! -d "$efi_vars_dir" ]; then - echo "System not running in EFI mode, not installing to EFI system partition." - exit 0 -fi - -for BINARY in $(find /usr/lib/fwupdate -name '*.efi' -printf "%f\n"); do - ESP="/boot/efi/EFI/$DISTRIBUTOR" - ESP_FILE="$ESP/$BINARY" - SIGNED_FILE="/usr/lib/fwupdate/$BINARY.signed" - UNSIGNED_FILE="/usr/lib/fwupdate/$BINARY" - - if [ -f "$ESP_FILE" ]; then - ESP_MD5=$(md5sum "$ESP_FILE" | sed 's, .*,,') - fi - - if [ -f "$SIGNED_FILE" ]; then - COMPARE="$SIGNED_FILE" - elif [ -z "$SECURE_BOOT" ]; then - COMPARE="$UNSIGNED_FILE" - fi - - mkdir -p $ESP/fw - - if [ -n "$COMPARE" ]; then - COMPARE_MD5=$(md5sum "$COMPARE" | sed 's, .*,,') - if [ "$COMPARE_MD5" != "$ESP_MD5" ]; then - rm -f "$ESP_FILE" - echo "Installing $BINARY to EFI system partition." - cp "$COMPARE" "$ESP_FILE" - fi - else - echo "Signed binary for $BINARY is not available, not installing binary to EFI system partition." - fi -done diff -Nru fwupdate-12/debian/watch fwupdate-12/debian/watch --- fwupdate-12/debian/watch 2018-08-06 04:02:24.000000000 +0000 +++ fwupdate-12/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -# You can run the "uscan" command to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -#opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/fwupdate-$1\.tar\.gz/ \ -#https://github.com/vathpela/fwupdate/tags .*/v?(\d\S*)\.tar\.gz - -https://github.com/rhinstaller/fwupdate/releases \ -.*[^n]/(?:|v|version-|r|REL_|rel-|fwupdate(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz) -