Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sdbootutil for openSUSE:Factory
checked in at 2025-04-04 17:29:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sdbootutil (Old)
and /work/SRC/openSUSE:Factory/.sdbootutil.new.1907 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sdbootutil"
Fri Apr 4 17:29:17 2025 rev:55 rq:1267153 version:1+git20250404.20a1dfb
Changes:
--------
--- /work/SRC/openSUSE:Factory/sdbootutil/sdbootutil.changes 2025-04-02
17:09:03.722528293 +0200
+++ /work/SRC/openSUSE:Factory/.sdbootutil.new.1907/sdbootutil.changes
2025-04-04 17:29:34.125161848 +0200
@@ -1,0 +2,14 @@
+Fri Apr 04 13:15:04 UTC 2025 - Alberto Planas Dominguez <apla...@suse.com>
+
+- Update to version 1+git20250404.20a1dfb:
+ * Limit 640 to 4 variations
+ * Fix get_default for grub2-bls
+
+-------------------------------------------------------------------
+Thu Apr 03 16:08:58 UTC 2025 - Alberto Planas Dominguez <apla...@suse.com>
+
+- Update to version 1+git20250403.0ae7eeb:
+ * Drop shifted variations before the new one
+ * Create loader.conf if missing
+
+-------------------------------------------------------------------
Old:
----
sdbootutil-1+git20250401.2eda714.obscpio
New:
----
sdbootutil-1+git20250404.20a1dfb.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sdbootutil.spec ++++++
--- /var/tmp/diff_new_pack.84fvb4/_old 2025-04-04 17:29:35.101202091 +0200
+++ /var/tmp/diff_new_pack.84fvb4/_new 2025-04-04 17:29:35.105202256 +0200
@@ -17,7 +17,7 @@
Name: sdbootutil
-Version: 1+git20250401.2eda714
+Version: 1+git20250404.20a1dfb
Release: 0
Summary: bootctl wrapper for BLS boot loaders
License: MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.84fvb4/_old 2025-04-04 17:29:35.141203740 +0200
+++ /var/tmp/diff_new_pack.84fvb4/_new 2025-04-04 17:29:35.145203905 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/sdbootutil.git</param>
- <param
name="changesrevision">2eda71499571a7d701cf7f9296e4ca1635fd2a66</param></service></servicedata>
+ <param
name="changesrevision">20a1dfbaa97e6bff8f36b5ac80904df18b2266b8</param></service></servicedata>
(No newline at EOF)
++++++ sdbootutil-1+git20250401.2eda714.obscpio ->
sdbootutil-1+git20250404.20a1dfb.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sdbootutil-1+git20250401.2eda714/sdbootutil
new/sdbootutil-1+git20250404.20a1dfb/sdbootutil
--- old/sdbootutil-1+git20250401.2eda714/sdbootutil 2025-04-01
15:52:47.000000000 +0200
+++ new/sdbootutil-1+git20250404.20a1dfb/sdbootutil 2025-04-04
15:13:34.000000000 +0200
@@ -1615,6 +1615,8 @@
local key="${1:?}"
local value="${2:?}"
+ [ -e "${boot_root}/loader/loader.conf" ] || touch
"${boot_root}/loader/loader.conf"
+
if grep -q "^$key " "${boot_root}/loader/loader.conf"; then
sed -i -e "s/^$key .*/$key $value/"
"${boot_root}/loader/loader.conf"
else
@@ -1636,7 +1638,7 @@
local key="${1:?}"
local value="${2:?}"
- [ -f "${boot_root}${boot_dst}/grubenv" ] || touch
"${boot_root}${boot_dst}/grubenv"
+ [ -e "${boot_root}${boot_dst}/grubenv" ] || touch
"${boot_root}${boot_dst}/grubenv"
grubenv="$(mktemp -t grubenv.XXXXXX)"
echo "# GRUB Environment Block" > "$grubenv"
@@ -1714,6 +1716,10 @@
local val
val="$(bli_efi_var_get "LoaderEntryDefault")"
[ -n "$val" ] || val="$(loader_conf_get "default")"
+ [ -n "$val" ] || {
+ update_entries_for_this_system
+ jq -r '.[] | select(.isDefault == true) | .id' < "$entryfile"
+ }
[ -z "$val" ] || echo "$val"
}
@@ -1721,6 +1727,7 @@
{
local val
val="$(grubenv_get "default")"
+ [ -n "$val" ] || val="$(get_default_sdboot "default")"
[ -z "$val" ] || echo "$val"
}
@@ -2011,7 +2018,13 @@
if [ -n "$variation" ]; then
vname="$(basename "$variation")"
dbg "$variation found in the eventlog"
- [[ "$vname" == shift-* ]] || mv "$variation"
"/var/lib/pcrlock.d/$component.pcrlock.d/shift-$vname"
+ [[ "$vname" == shift-* ]] || {
+ # Drop any previous shifted variation, as
+ # there is no guarantee that the new one will
+ # share the name
+ find /var/lib/pcrlock.d/"$component".pcrlock.d -name
'shift-*.pcrlock' -delete
+ mv "$variation"
"/var/lib/pcrlock.d/$component.pcrlock.d/shift-$vname"
+ }
else
dbg "No matching variation found for $component"
return 0
@@ -2184,8 +2197,9 @@
[ -z "${kernels["$linux"]}" ] || continue
kernels["$linux"]=1
n=$((n+1))
- [ "$n" -le 8 ] || {
- info "More than 8 variations for
650-kernel-efi-application"
+ # Limit to 4 because of the separator
+ [ "$n" -le 4 ] || {
+ info "More than 4 variations for
650-kernel-efi-application"
continue
}
pcrlock \
++++++ sdbootutil.obsinfo ++++++
--- /var/tmp/diff_new_pack.84fvb4/_old 2025-04-04 17:29:35.253208359 +0200
+++ /var/tmp/diff_new_pack.84fvb4/_new 2025-04-04 17:29:35.257208523 +0200
@@ -1,5 +1,5 @@
name: sdbootutil
-version: 1+git20250401.2eda714
-mtime: 1743515567
-commit: 2eda71499571a7d701cf7f9296e4ca1635fd2a66
+version: 1+git20250404.20a1dfb
+mtime: 1743772414
+commit: 20a1dfbaa97e6bff8f36b5ac80904df18b2266b8
