diff -Nru efivar-38/debian/changelog efivar-38/debian/changelog --- efivar-38/debian/changelog 2023-11-01 01:39:34.000000000 +0100 +++ efivar-38/debian/changelog 2023-11-27 14:19:24.000000000 +0100 @@ -1,3 +1,13 @@ +efivar (38-2ubuntu1) noble; urgency=medium + + * Merge 38-2 from Debian (LP: #2044789) + * Keep from 37-6ubuntu3 + d/p/0001-linux-handle-non-ACPI-systems-in-device_get.patch + * Remove obsolete patch + d/p/guid-stringop-trunction-ignore.diff + + -- Heinrich Schuchardt Mon, 27 Nov 2023 14:19:24 +0100 + efivar (38-2) unstable; urgency=medium * Don't compile with -march=native. Closes: #1055123 @@ -25,6 +35,26 @@ -- Steve McIntyre <93sam@debian.org> Tue, 31 Oct 2023 11:40:31 +0000 +efivar (37-6ubuntu3) mantic; urgency=medium + + * Fix creation of boot options on non-ACPI systems (LP: #2029407) + d/p/0001-linux-handle-non-ACPI-systems-in-device_get.patch + + -- Heinrich Schuchardt Thu, 03 Aug 2023 10:21:40 +0200 + +efivar (37-6ubuntu2) impish; urgency=medium + + * No-change rebuild to build packages with zstd compression. + + -- Matthias Klose Thu, 07 Oct 2021 12:11:08 +0200 + +efivar (37-6ubuntu1) hirsute; urgency=medium + + * Ignore stringop-truncation warnings in text_to_guid, seen when building + with lto. + + -- Matthias Klose Mon, 29 Mar 2021 12:59:06 +0200 + efivar (37-6) unstable; urgency=medium [ dann frazier ] diff -Nru efivar-38/debian/control efivar-38/debian/control --- efivar-38/debian/control 2023-10-31 12:58:06.000000000 +0100 +++ efivar-38/debian/control 2023-11-27 14:19:24.000000000 +0100 @@ -1,6 +1,7 @@ Source: efivar Priority: optional -Maintainer: Debian UEFI Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian UEFI Maintainers Uploaders: Steve McIntyre <93sam@debian.org>, Mario Limonciello Build-Depends: debhelper-compat (= 13), libpopt-dev, pkg-config, mandoc, grub-common Standards-Version: 4.1.1 diff -Nru efivar-38/debian/patches/0001-linux-handle-non-ACPI-systems-in-device_get.patch efivar-38/debian/patches/0001-linux-handle-non-ACPI-systems-in-device_get.patch --- efivar-38/debian/patches/0001-linux-handle-non-ACPI-systems-in-device_get.patch 2023-10-31 12:58:06.000000000 +0100 +++ efivar-38/debian/patches/0001-linux-handle-non-ACPI-systems-in-device_get.patch 2023-11-27 14:19:24.000000000 +0100 @@ -20,21 +20,21 @@ Origin: https://github.com/rhboot/efivar/pull/246/commits/b1209a10c55836fcd63dfcbe7e84ac6a7d4a2238 Forwarded: yes -Last-Updated: 2023-08-02 +Last-Updated: 2023-11-27 --- src/linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/src/linux.c +++ b/src/linux.c -@@ -506,8 +506,8 @@ - debug("trying %s", probe->name); - pos = probe->parse(dev, current, dev->link); - if (pos < 0) { -- efi_error("parsing %s failed", probe->name); -- goto err; -+ debug("parsing %s failed", probe->name); -+ continue; - } else if (pos > 0) { - debug("%s matched %s", probe->name, current); - dev->flags |= probe->flags; +@@ -525,8 +525,8 @@ + debug("trying %s", probe->name); + pos = probe->parse(dev, current, dev->link); + if (pos < 0) { +- efi_error("parsing %s failed", probe->name); +- goto err; ++ debug("parsing %s failed", probe->name); ++ continue; + } else if (pos > 0) { + char match[pos+1]; + diff -Nru efivar-38/debian/patches/series efivar-38/debian/patches/series --- efivar-38/debian/patches/series 2023-11-01 01:39:42.000000000 +0100 +++ efivar-38/debian/patches/series 2023-11-27 14:19:24.000000000 +0100 @@ -1 +1,2 @@ +0001-linux-handle-non-ACPI-systems-in-device_get.patch 0002_no_host_march.patch