Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sdbootutil for openSUSE:Factory
checked in at 2024-07-19 17:59:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sdbootutil (Old)
and /work/SRC/openSUSE:Factory/.sdbootutil.new.17339 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sdbootutil"
Fri Jul 19 17:59:04 2024 rev:25 rq:1188690 version:1+git20240719.36c650f
Changes:
--------
--- /work/SRC/openSUSE:Factory/sdbootutil/sdbootutil.changes 2024-07-18
19:15:17.368604812 +0200
+++ /work/SRC/openSUSE:Factory/.sdbootutil.new.17339/sdbootutil.changes
2024-07-19 17:59:05.663107818 +0200
@@ -1,0 +2,7 @@
+Fri Jul 19 13:59:04 UTC 2024 - apla...@suse.com
+
+- Update to version 1+git20240719.36c650f:
+ * Remove pcrlock.d if there are too many files
+ * Limit LAST_WORKING_SNAPSHOTS to 3
+
+-------------------------------------------------------------------
Old:
----
sdbootutil-1+git20240718.6fbaad1.obscpio
New:
----
sdbootutil-1+git20240719.36c650f.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sdbootutil.spec ++++++
--- /var/tmp/diff_new_pack.16acD0/_old 2024-07-19 17:59:06.571144044 +0200
+++ /var/tmp/diff_new_pack.16acD0/_new 2024-07-19 17:59:06.571144044 +0200
@@ -27,7 +27,7 @@
%define git_version %{nil}
%endif
Name: sdbootutil
-Version: 1+git20240718.6fbaad1%{git_version}
+Version: 1+git20240719.36c650f%{git_version}
Release: 0
Summary: script to install shim with sd-boot
License: MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.16acD0/_old 2024-07-19 17:59:06.615145800 +0200
+++ /var/tmp/diff_new_pack.16acD0/_new 2024-07-19 17:59:06.619145959 +0200
@@ -3,6 +3,6 @@
<param
name="url">https://github.com/lnussel/sdbootutil.git</param>
<param
name="changesrevision">708592a5033bb41d14e378172466ae9e90dfb3c4</param></service><service
name="tar_scm">
<param
name="url">https://github.com/openSUSE/sdbootutil.git</param>
- <param
name="changesrevision">6fbaad1a48cb99629775d6584cdbc90de826a1d8</param></service></servicedata>
+ <param
name="changesrevision">36c650fd2643e9364526dcee5e943f05a75706d1</param></service></servicedata>
(No newline at EOF)
++++++ sdbootutil-1+git20240718.6fbaad1.obscpio ->
sdbootutil-1+git20240719.36c650f.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sdbootutil-1+git20240718.6fbaad1/sdbootutil
new/sdbootutil-1+git20240719.36c650f/sdbootutil
--- old/sdbootutil-1+git20240718.6fbaad1/sdbootutil 2024-07-18
12:02:41.000000000 +0200
+++ new/sdbootutil-1+git20240719.36c650f/sdbootutil 2024-07-19
15:56:39.000000000 +0200
@@ -1551,8 +1551,9 @@
[ -s "$snapperfile" ] || update_snapper
# Select the default and the active snapshots. Also include
- # one extra snapshot if is passed as a parameter, that refers
- # the snapshot from where we are installing the kernel
+ # one extra snapshot if it is passed as a parameter, that
+ # refers to the snapshot from where we are installing the
+ # kernel
declare -A snapshots
[ -z "$snapshot" ] || snapshots["$snapshot"]=1
local id
@@ -1564,7 +1565,9 @@
# shellcheck disable=SC1090
. "${state_file}"
for id in $LAST_WORKING_SNAPSHOTS; do
- snapshots[$id]=1
+ if [ "${#snapshots[@]}" -lt 3 ]; then
+ snapshots[$id]=1
+ fi
done
else
while read -r id; do
@@ -1867,12 +1870,9 @@
fi
}
-generate_tpm2_predictions_pcrlock()
+clean_pcrlock_d()
{
- local pcrs="$1"
-
- # Select the affected entries
- select_entries_for_prediction
+ [ -d /var/lib/pcrlock.d ] || return
# Remove older (1 week) generated measurements. This will
# keep the predictions at minimum and decrease the
@@ -1880,7 +1880,23 @@
# conditions. For example, after the first boot some pcrlock
# files contain hashes for the original ESP assets, that are
# required for the event log aligment.
- [ ! -d /var/lib/pcrlock.d ] || find /var/lib/pcrlock.d -name
'*.pcrlock' -type f -mtime +7 -delete
+ find /var/lib/pcrlock.d -name '*.pcrlock' -type f -mtime +7 -delete
+
+ # Sometimes, like in tests, the user will generate new entries
+ # and reboot in a short period of time
+ if [ "$(find /var/lib/pcrlock.d -type f -name '*-7.pcrlock' | wc -l)"
-gt 0 ]; then
+ rm -fr /var/lib/pcrlock.d
+ fi
+}
+
+generate_tpm2_predictions_pcrlock()
+{
+ local pcrs="$1"
+
+ # Select the affected entries
+ select_entries_for_prediction
+
+ clean_pcrlock_d
pcrlock lock-firmware-code
pcrlock lock-firmware-config
++++++ sdbootutil.obsinfo ++++++
--- /var/tmp/diff_new_pack.16acD0/_old 2024-07-19 17:59:06.727150268 +0200
+++ /var/tmp/diff_new_pack.16acD0/_new 2024-07-19 17:59:06.731150428 +0200
@@ -1,5 +1,5 @@
name: sdbootutil
-version: 1+git20240718.6fbaad1
-mtime: 1721296961
-commit: 6fbaad1a48cb99629775d6584cdbc90de826a1d8
+version: 1+git20240719.36c650f
+mtime: 1721397399
+commit: 36c650fd2643e9364526dcee5e943f05a75706d1
