From be4d322edfdeca5c5319f60d483b5b0904561d74e89d00b4bafb47c2d48efc49 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Wed, 20 Sep 2023 12:19:16 +0000
Subject: [PATCH] Accepting request 1112549 from devel:microos:systemd-boot

- Update to version 1+git20230817.2a3cd34:
  * Ignore errors from efibootmgr
  * Update spec file
  * Add marker to flag installation using sdbootutil
  * Refactor and fix boot entry installation
  * Don't exit in warn()
  * feat: use arg_esp_path directly
  * fix: get esp_device from bootctl
  * fix: only install shim for secure boot
  * feat: create only non-existing entries & pass correct ESP partition
  * fix: make efibootmgr silent
  * feat: create boot menu entries when installed

OBS-URL: https://build.opensuse.org/request/show/1112549
OBS-URL: https://build.opensuse.org/package/show/devel:microos/sdbootutil?expand=0&rev=13
---
 _servicedata                             |  2 +-
 sdbootutil-1+git20230814.38973c7.obscpio |  3 ---
 sdbootutil-1+git20230817.2a3cd34.obscpio |  3 +++
 sdbootutil.changes                       | 16 ++++++++++++++++
 sdbootutil.obsinfo                       |  6 +++---
 sdbootutil.spec                          |  8 +++++---
 6 files changed, 28 insertions(+), 10 deletions(-)
 delete mode 100644 sdbootutil-1+git20230814.38973c7.obscpio
 create mode 100644 sdbootutil-1+git20230817.2a3cd34.obscpio

diff --git a/_servicedata b/_servicedata
index 0419a53..352a997 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/lnussel/sdbootutil.git</param>
-              <param name="changesrevision">38973c76394e4c4120c626df82ecb8fc956e5847</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">2a3cd34a65361917adef2023dc312362af7e970d</param></service></servicedata>
\ No newline at end of file
diff --git a/sdbootutil-1+git20230814.38973c7.obscpio b/sdbootutil-1+git20230814.38973c7.obscpio
deleted file mode 100644
index 7aac1cf..0000000
--- a/sdbootutil-1+git20230814.38973c7.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9013b191efe4173c025ffc36b45fafe3dba039c65673d771dbb71c9e16fb651a
-size 336395
diff --git a/sdbootutil-1+git20230817.2a3cd34.obscpio b/sdbootutil-1+git20230817.2a3cd34.obscpio
new file mode 100644
index 0000000..a56d73c
--- /dev/null
+++ b/sdbootutil-1+git20230817.2a3cd34.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f38d4b3b8a1044463a3e2445e58c4929b085df0c9dc38cd4f2eebc4dfc8d11e
+size 337931
diff --git a/sdbootutil.changes b/sdbootutil.changes
index 5d48e0d..f45b0f8 100644
--- a/sdbootutil.changes
+++ b/sdbootutil.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Aug 17 12:02:02 UTC 2023 - lnussel@suse.de
+
+- Update to version 1+git20230817.2a3cd34:
+  * Ignore errors from efibootmgr
+  * Update spec file
+  * Add marker to flag installation using sdbootutil
+  * Refactor and fix boot entry installation
+  * Don't exit in warn()
+  * feat: use arg_esp_path directly
+  * fix: get esp_device from bootctl
+  * fix: only install shim for secure boot
+  * feat: create only non-existing entries & pass correct ESP partition
+  * fix: make efibootmgr silent
+  * feat: create boot menu entries when installed
+
 -------------------------------------------------------------------
 Mon Aug 14 13:24:43 UTC 2023 - lnussel@suse.com
 
diff --git a/sdbootutil.obsinfo b/sdbootutil.obsinfo
index ffa8b62..40e00f8 100644
--- a/sdbootutil.obsinfo
+++ b/sdbootutil.obsinfo
@@ -1,4 +1,4 @@
 name: sdbootutil
-version: 1+git20230814.38973c7
-mtime: 1692019369
-commit: 38973c76394e4c4120c626df82ecb8fc956e5847
+version: 1+git20230817.2a3cd34
+mtime: 1692273697
+commit: 2a3cd34a65361917adef2023dc312362af7e970d
diff --git a/sdbootutil.spec b/sdbootutil.spec
index 09ea47b..efd1012 100644
--- a/sdbootutil.spec
+++ b/sdbootutil.spec
@@ -27,7 +27,7 @@ BuildRequires:  git-core
 %define git_version %{nil}
 %endif
 Name:           sdbootutil
-Version:        1+git20230814.38973c7%{git_version}
+Version:        1+git20230817.2a3cd34%{git_version}
 Release:        0
 Summary:        script to install shim with sd-boot
 License:        MIT
@@ -53,7 +53,8 @@ Supplements:    (snapper and btrfsprogs and sdbootutil)
 Plugin scripts for snapper to handle BLS config files
 
 %package rpm-scriptlets
-Summary:        dummy scriptlets for the kernel
+Summary:        Scripts to create boot entries on kernel updates
+Requires:       sdbootutil >= %{version}-%{release}
 # make sure to not replace scriptlets with nops on systems that
 # use grub2
 Conflicts:      grub2
@@ -62,7 +63,8 @@ Provides:       suse-kernel-rpm-scriptlets
 Obsoletes:      %{name}-filetriggers < %{version}
 
 %description rpm-scriptlets
-Empty scriptlets to satisfy kernel dependencies
+Scriptlets that call sdbootutil to create boot entries when
+kernels are installed or removed
 
 %prep
 %setup -q