diff -Nru fwupd-signed-1.27.1ubuntu5/debian/changelog fwupd-signed-1.27.1ubuntu7/debian/changelog --- fwupd-signed-1.27.1ubuntu5/debian/changelog 2021-07-26 15:50:19.000000000 +0800 +++ fwupd-signed-1.27.1ubuntu7/debian/changelog 2022-02-16 19:14:12.000000000 +0800 @@ -1,3 +1,22 @@ +fwupd-signed (1.27.1ubuntu7) focal; urgency=medium + + * remove fwupd-unsigned from the Recommends of fwupd-signed. + This is backported from v1.43 (LP: #1960783) + + -- Yuan-Chen Cheng Wed, 16 Feb 2022 19:14:12 +0800 + +fwupd-signed (1.27.1ubuntu6) focal; urgency=medium + + [ Yuan-Chen Cheng ] + * catch up 1.42 from jammy so we can SRU fwupd/fwupd-efi split back to + focal. (LP: #1949412, LP: #1955386) + + [ Ɓukasz 'sil2100' Zemczak ] + * debian/control: adjust the fwupd-unsigned dependency to support + source-copy backports (>= 1.1-3~ instead of 1.1-3). + + -- Yuan-Chen Cheng Tue, 08 Feb 2022 13:25:50 +0800 + fwupd-signed (1.27.1ubuntu5) focal; urgency=medium * Build depend on fwupd version 1.5.11-0ubuntu1~20.04.2, take #2 (LP: #1934209) diff -Nru fwupd-signed-1.27.1ubuntu5/debian/control fwupd-signed-1.27.1ubuntu7/debian/control --- fwupd-signed-1.27.1ubuntu5/debian/control 2021-07-26 15:50:11.000000000 +0800 +++ fwupd-signed-1.27.1ubuntu7/debian/control 2022-02-16 19:14:12.000000000 +0800 @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Ubuntu Developers -Build-Depends: debhelper (>= 9), python3, python3-apt, fwupd (>= 1.5.11-0ubuntu1~20.04.2) +Build-Depends: debhelper (>= 9), python3, python3-apt, fwupd-unsigned (>= 1:1.1-3~) Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/efi-team/fwupd-signed.git Vcs-Browser: https://salsa.debian.org/efi-team/fwupd-signed @@ -10,9 +10,9 @@ Package: fwupd-signed Architecture: amd64 i386 armhf arm64 Multi-Arch: foreign -Depends: ${misc:Depends}, fwupd (= ${fwupd:Version}) -Recommends: secureboot-db -Built-Using: fwupd (= ${fwupd:Version}) +Depends: ${misc:Depends}, +Recommends: secureboot-db, fwupd +Built-Using: fwupd-unsigned (= ${fwupd:Version}) Description: Linux Firmware Updater EFI signed binary fwupd provides functionality to update system firmware. It has been initially designed to update firmware using UEFI capsule updates, but diff -Nru fwupd-signed-1.27.1ubuntu5/download-fwupd fwupd-signed-1.27.1ubuntu7/download-fwupd --- fwupd-signed-1.27.1ubuntu5/download-fwupd 2020-03-05 01:02:03.000000000 +0800 +++ fwupd-signed-1.27.1ubuntu7/download-fwupd 2022-02-08 12:59:45.000000000 +0800 @@ -17,10 +17,19 @@ arch = apt_pkg.config['Apt::Architecture'] efi_name = ARCH_TO_EFI_NAME[arch] cache = apt.Cache() -fwupd_efi = cache["fwupd"].candidate +try: + fwupd_efi = cache["fwupd-unsigned"].candidate +except KeyError: + print("fwupd-unsigned not found, falling back to fwupd") + fwupd_efi = cache["fwupd"].candidate +version = fwupd_efi.version +#drop the epoch from the version as UEFI binary doesn't use it +if ':' in version: + version = version.split(':')[1] pool_parsed = urlparse(fwupd_efi.uri) -dists_dir = "/dists/%s/main/uefi/fwupd-%s/current/" % ( - fwupd_efi.origins[0].archive, fwupd_efi.architecture) +dists_dir = "/dists/%s/main/uefi/fwupd-%s/%s/" % ( + fwupd_efi.origins[0].archive, fwupd_efi.architecture, + version) for base in ( "fwupd%s.efi.signed" %efi_name,