Merge ~bamf0/ubuntu/+source/efibootmgr:merge-lp2133493-resolute into ubuntu/+source/efibootmgr:debian/sid

[Simon Johnsson]

[Simon Johnsson (bamf0)]

PPA: https://launchpad.net/~bamf0/+archive/ubuntu/resolute-efibootmgr-merge-lp2133493

NOTE: efibootmgr currently fails to build for s390x. This is due to missing dependencies, libefivar-dev (>= 30), libefiboot-dev (>= 30) that are part of the efivar package, which currently fails to build for s390x.

---

Preface: run these tests on a VM through an emulator with UEFI support such as QEMU.

If you do not have a setup for this currently, I recommend using Valentin David's script for launching QEMU (https://gist.github.com/valentindavid/7a6a74e6da16a3865b88e8bdf5c0294c):

1) Download the Resolute Daily build ISO (https://cdimage.ubuntu.com/daily-dangerous/current/)
2) Make a directory for the VM
3) Install the ISO in the directory using:
    $ ./qemu.sh clear reset cdrom <ISO path>
4) After installation, launch the VM with:
    $ ./qemu.sh

Basic tests:

# Check the boot status
$ efibootmgr

# Check the version - should give "18"
$ efibootmgr --version

# Reverse the boot order (e.g., if current order is 0000,0001,0002)
$ efibootmgr -o 0002,0001,0000

# Set BootNext
$ efibootmgr -n 0002
$ efibootmgr | grep BootNext # should be 0002

---

Regression test:

# For the first and last bootentry in the bootorder
$ efibootmgr -A -b <first/last> # should inactivate the entry
$ efibootmgr # entry should not have "*"

$ efibootmgr -a -b <first/last> # should activate the entry
$ efibootmgr # entry should have "*"

---

Package tests:
This package contains no tests.

[Nick Rosbrook (enr0n)]

LGTM. Thanks!

review: Approve

Unmerged commits

6586f80... by Simon Johnsson on 2025-12-04

changelog

1bcb0f6... by Simon Johnsson on 2025-12-04

update-maintainer

070b1d4... by Simon Johnsson on 2025-12-04

reconstruct-changelog

9e5d201... by Simon Johnsson on 2025-12-04

merge-changelogs

daa4f9e... by Simon Johnsson on 2025-12-04

Disable GCS linker warnings on arm64

50ff4ff... by Simon Johnsson on 2025-12-04

Include patch for active and inactive commands

2cd55a5... by Simon Johnsson on 2025-12-04

Un-ignore patches

diff --git a/.gitignore b/.gitignore
index e216036..b0dab6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .*.sw?
 *.E
 *.o
-*.patch
 *.S
 efibootmgr-*.tar.*
 core.*
diff --git a/debian/changelog b/debian/changelog
index 60f8916..a60e2f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+efibootmgr (18-4ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/.gitignore: Un-ignore patches
+    - d/rules: Disable GCS linker warnings on arm64
+    - d/p/fix-active-inactive-commands.patch: Patch active and inactive commands
+
+ -- Simon Johnsson <[e-mail]>  Thu, 04 Dec 2025 10:53:37 +0100
+
 efibootmgr (18-4) unstable; urgency=medium
 
   * d/control: Build for exact same architectures as efivar
@@ -20,6 +29,29 @@ efibootmgr (18-3) unstable; urgency=medium
 
  -- Mario Limonciello <[e-mail]>  Mon, 18 Aug 2025 15:05:18 -0500
 
+efibootmgr (18-2ubuntu3) resolute; urgency=medium
+
+  * d/rules: actually disable GCS linker warnings
+
+ -- Nick Rosbrook <[e-mail]>  Mon, 17 Nov 2025 10:24:01 -0500
+
+efibootmgr (18-2ubuntu2) resolute; urgency=medium
+
+  * d/rules: ignore GCS linker warnings on arm64
+
+ -- Nick Rosbrook <[e-mail]>  Mon, 17 Nov 2025 09:50:06 -0500
+
+efibootmgr (18-2ubuntu1) resolute; urgency=medium
+
+  [ Nick Rosbrook ]
+  * debian/.gitignore: un-ignore patches
+
+  [ Tomohiro Masubuchi ]
+  * Fixed that active and inactive commands cannot find any entries except
+    last one (LP: #2112632)
+
+ -- Tomohiro Masubuchi <[e-mail]>  Mon, 20 Oct 2025 15:39:45 -0400
+
 efibootmgr (18-2) unstable; urgency=medium
 
   [ Chris Hofstaedtler ]
diff --git a/debian/control b/debian/control
index 6cca3f1..9205399 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: efibootmgr
 Section: admin
 Priority: optional
-Maintainer: Debian UEFI Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian UEFI Maintainers <[e-mail]>
 Uploaders: Steve McIntyre <[e-mail]>, Mario Limonciello <[e-mail]>
 Build-Depends: debhelper-compat (= 13), pkgconf, libefivar-dev (>= 30), libefiboot-dev (>= 30), libpopt-dev
 Standards-Version: 4.7.2.0
diff --git a/debian/patches/fix-active-inactive-commands.patch b/debian/patches/fix-active-inactive-commands.patch
new file mode 100644
index 0000000..bed30e9
--- /dev/null
+++ b/debian/patches/fix-active-inactive-commands.patch
@@ -0,0 +1,19 @@
+Description: active and inactive commands cannot find any entries except last one
+ [PATCH] Update efibootmgr.c
+ get_entry: return entry if it was found before reaching the end of the list
+Origin: upstream, https://github.com/rhboot/efibootmgr/commit/3eac27c5fccf93d2d6e634d6fe2a76d06708ec6e
+Bug: https://github.com/rhboot/efibootmgr/issues/186
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/efibootmgr/+bug/2112632
+Last-Update: 2025-08-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/efibootmgr.c
++++ b/src/efibootmgr.c
+@@ -1192,6 +1192,7 @@ get_entry(list_t *entries, uint16_t num)
+ 			entry = NULL;
+ 			continue;
+ 		}
++		return entry;
+ 	}
+ 
+ 	return entry;
diff --git a/debian/patches/series b/debian/patches/series
index 897ba25..77e1886 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix-active-inactive-commands.patch
 0001-Format-File-instead-of-just-File-.shim.efi-as-string.patch
diff --git a/debian/rules b/debian/rules
index 3dc9e98..3dd62af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,10 @@
 export DH_VERBOSE=1
 export DH_OPTIONS=-v
 
+ifeq ($(DEB_TARGET_ARCH),arm64)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,gcs-report-dynamic=none
+endif
+
 EFIDIR ?= $(shell dpkg-vendor --query vendor | awk '{ print tolower($$0) }')
 
 %: