Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package suse-module-tools for
openSUSE:Factory checked in at 2023-09-06 18:56:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Wed Sep 6 18:56:27 2023 rev:68 rq:1109139 version:16.0.35
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2023-09-02 22:07:19.522561161 +0200
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.1766/suse-module-tools.changes
2023-09-06 18:57:52.242868781 +0200
@@ -1,0 +2,9 @@
+Tue Sep 5 19:10:35 UTC 2023 - Martin Wilck <[email protected]>
+
+- Update to version 16.0.35:
+
+ * split off regenerate-initrd-posttrans in the kernel-scriptlets package
+ (boo#1213459)
+ * wm2: Update for usrmerge (boo#1214428)
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-16.0.34.obscpio
New:
----
suse-module-tools-16.0.35.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.uWb8UB/_old 2023-09-06 18:57:53.742922255 +0200
+++ /var/tmp/diff_new_pack.uWb8UB/_new 2023-09-06 18:57:53.746922398 +0200
@@ -36,7 +36,7 @@
%global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^
]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
Name: suse-module-tools
-Version: 16.0.34
+Version: 16.0.35
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -224,7 +224,6 @@
%dir /usr/lib/module-init-tools
/usr/lib/module-init-tools/driver-check.sh
/usr/lib/module-init-tools/lsinitrd-quick
-/usr/lib/module-init-tools/regenerate-initrd-posttrans
/usr/lib/module-init-tools/unblacklist
/usr/lib/module-init-tools/weak-modules2
%{_unitdir}/*.service
@@ -237,5 +236,6 @@
#
%files scriptlets
/usr/lib/module-init-tools/kernel-scriptlets
+/usr/lib/module-init-tools/regenerate-initrd-posttrans
%changelog
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.uWb8UB/_old 2023-09-06 18:57:53.798924252 +0200
+++ /var/tmp/diff_new_pack.uWb8UB/_new 2023-09-06 18:57:53.798924252 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/suse-module-tools.git</param>
- <param
name="changesrevision">8f4b4329cd51f4156e097721d2e4f21c86939858</param></service></servicedata>
+ <param
name="changesrevision">c48173fba4679b2501faab4a6241b8a057b0490e</param></service></servicedata>
(No newline at EOF)
++++++ suse-module-tools-16.0.34.obscpio -> suse-module-tools-16.0.35.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.34/suse-module-tools.spec
new/suse-module-tools-16.0.35/suse-module-tools.spec
--- old/suse-module-tools-16.0.34/suse-module-tools.spec 2023-09-01
17:21:04.000000000 +0200
+++ new/suse-module-tools-16.0.35/suse-module-tools.spec 2023-09-05
18:16:46.000000000 +0200
@@ -36,7 +36,7 @@
%global modprobe_conf_rpmsave %(echo "%{modprobe_conf_files}" | sed 's,\\([^
]*\\),%{_sysconfdir}/modprobe.d/\\1.conf.rpmsave,g')
Name: suse-module-tools
-Version: 16.0.34
+Version: 16.0.35
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -224,7 +224,6 @@
%dir /usr/lib/module-init-tools
/usr/lib/module-init-tools/driver-check.sh
/usr/lib/module-init-tools/lsinitrd-quick
-/usr/lib/module-init-tools/regenerate-initrd-posttrans
/usr/lib/module-init-tools/unblacklist
/usr/lib/module-init-tools/weak-modules2
%{_unitdir}/*.service
@@ -237,5 +236,6 @@
#
%files scriptlets
/usr/lib/module-init-tools/kernel-scriptlets
+/usr/lib/module-init-tools/regenerate-initrd-posttrans
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.34/weak-modules2
new/suse-module-tools-16.0.35/weak-modules2
--- old/suse-module-tools-16.0.34/weak-modules2 2023-09-01 17:21:04.000000000
+0200
+++ new/suse-module-tools-16.0.35/weak-modules2 2023-09-05 18:16:46.000000000
+0200
@@ -2,11 +2,11 @@
##############################################################################
# How it works:
-# * Kernels install modules below /lib/modules/$krel/kernel/.
-# * KMPs install modules below /lib/modules/$krel/updates/ or .../extra/.
+# * Kernels install modules below /usr/lib/modules/$krel/kernel/.
+# * KMPs install modules below /usr/lib/modules/$krel/updates/ or .../extra/.
# * Symbolic links to modules of compatible KMPs are created under
-# /lib/modules/$krel/weak-updates/{updates,extra}/... (the original path
-# below /lib/modules/$other_krel is used).
+# /usr/lib/modules/$krel/weak-updates/{updates,extra}/... (the original path
+# below /usr/lib/modules/$other_krel is used).
# * Depmod searches the directories in this order: updates/, extra/,
# weak-updates/, kernel/ (see /etd/depmod.conf or
# /etc/depmod.d/00-system.conf for details).
@@ -45,7 +45,7 @@
# $kmpshort: name of a kmp, e.g kqemu-kmp-default
# $basename: portion of $kmp up to the "-kmp-" part, e.g kqemu
# $flavor: flavor of a kmp or kernel, e.g default
-# $krel: kernel version, as in /lib/modules/$krel
+# $krel: kernel version, as in /usr/lib/modules/$krel
# $module: full path to a module below updates/
# $symlink: full path to a module symlink below weak-updates/
#
@@ -139,7 +139,7 @@
symlink_to_module() {
local module=$1 krel=$2
- echo /lib/modules/$krel/weak-updates/${module#/lib/modules/*/}
+ echo /usr/lib/modules/$krel/weak-updates/${module#/usr/lib/modules/*/}
}
# Is a kmp already present in or linked to from this kernel?
@@ -165,7 +165,7 @@
return $res
}
-# Add the modules of a kmp to /lib/modules/$krel
+# Add the modules of a kmp to /usr/lib/modules/$krel
add_kmp_modules() {
local kmp=$1 krel=$2 basedir=$3
@@ -180,7 +180,7 @@
done < $tmpdir/modules-$kmp
}
-# Remove the modules of a kmp from /lib/modules/$krel
+# Remove the modules of a kmp from /usr/lib/modules/$krel
remove_kmp_modules() {
local kmp=$1 krel=$2 basedir=$3
@@ -194,9 +194,9 @@
done < $tmpdir/modules-$kmp
}
-# Create a temporary working copy of /lib/modules/$1
+# Create a temporary working copy of /usr/lib/modules/$1
create_temporary_modules_dir() {
- local modules_dir=/lib/modules/$1 basedir=$2
+ local modules_dir=/usr/lib/modules/$1 basedir=$2
local opt_v=${opt_debug:+-v}
mkdir -p $opt_v $basedir$modules_dir/weak-updates
@@ -252,7 +252,7 @@
basenames_are_unique() {
local kmp=$1 krel=$2 basedir=$3 dir
- for dir in $basedir/lib/modules/$krel/{weak-updates,updates,extra}/; do
+ for dir in $basedir/usr/lib/modules/$krel/{weak-updates,updates,extra}/; do
if [ ! -d "$dir" ]; then
continue
fi
@@ -273,7 +273,7 @@
local old_kmp=$1 new_kmp=$2 krel=$3
local basedir=$tmpdir/$krel
- local weak_updates=/lib/modules/$krel/weak-updates/
+ local weak_updates=/usr/lib/modules/$krel/weak-updates/
[ -d "$basedir" ] || \
create_temporary_modules_dir "$krel" "$basedir"
@@ -305,7 +305,7 @@
local kmp=$1
# Make sure all modules are for the same kernel
- set -- $(sed -re 's:^/lib/modules/([^/]+)/.*:\1:' \
+ set -- $(sed -re 's:^/usr/lib/modules/([^/]+)/.*:\1:' \
$tmpdir/modules-$kmp \
| sort -u)
if [ $# -ne 1 ]; then
@@ -317,7 +317,7 @@
dlog "check_kmp: $kmp contains modules for $1"
# Make sure none of the modules are in kernel/ or weak-updates/
- if grep -qE -e '^/lib/modules/[^/]+/(kernel|weak-updates)/' \
+ if grep -qE -e '^/usr/lib/modules/[^/]+/(kernel|weak-updates)/' \
$tmpdir/modules-$kmp; then
echo "Error: package $kmp must not install modules into " \
"kernel/ or weak-updates/" >&2
@@ -342,7 +342,7 @@
continue
fi
rpm -ql --nodigest --nosignature "$kmp" \
- | sed -nr
's:^(/usr)?(/lib/modules/[^/]+/.+\.ko)(\.[gx]z|\.zst)?$:\2\3:p' \
+ | grep -Ee '^/usr/lib/modules/[^/]+/.+\.ko(\.[gx]z|\.zst)?$' \
> $tmpdir/modules-$kmp
if [ $? != 0 ]; then
echo "WARNING: $kmp does not contain any kernel modules" >&2
@@ -392,7 +392,7 @@
get_initrd_basenames() {
$LSINITRD /boot/initrd-$1 | \
- sed -rn 's:.*\<lib/modules/.*/::p' | \
+ sed -rn 's:.*\<usr/lib/modules/.*/::p' | \
strip_mod_extensions
INITRD_MODULES=
@@ -455,7 +455,7 @@
local status=0
local system_map
- if [ -d /lib/modules/$krel ]; then
+ if [ -d /usr/lib/modules/$krel ]; then
system_map=$(find_usrmerge_boot System.map "$krel")
if [ -n "$system_map" ]; then
doit "$DEPMOD" -F "$system_map" -ae "$krel" || return 1
@@ -528,7 +528,7 @@
dlog "kernel_changed: kernel removed"
return 0
fi
- if [ ! -d /lib/modules/$krel ]; then
+ if [ ! -d /usr/lib/modules/$krel ]; then
# a kernel without modules - rebuild initrd nevertheless (to mount the
# root fs, etc).
dlog "kernel_changed: kernel without modules"
@@ -548,7 +548,7 @@
remove_kernel() {
local krel=$1
- local dir=/lib/modules/$krel
+ local dir=/usr/lib/modules/$krel
if [ -d $dir/weak-updates ]; then
rm -rf $dir/weak-updates
fi
@@ -580,8 +580,8 @@
find_kmps "$basename" "$flavor" || return 1
local dir krel status
- for dir in /lib/modules/*; do
- krel=${dir#/lib/modules/}
+ for dir in /usr/lib/modules/*; do
+ krel=${dir#/usr/lib/modules/}
case "$krel" in
*-$flavor)
;;
@@ -593,7 +593,7 @@
system_map=$(find_usrmerge_boot System.map "$krel")
[ -n "$system_map" ] || continue
if opt_debug=1 has_unresolved_symbols "$krel" "/"; then
- echo "Warning: /lib/modules/$krel is inconsistent" >&2
+ echo "Warning: /usr/lib/modules/$krel is inconsistent" >&2
echo "Warning: weak-updates symlinks might not be created" >&2
fi
@@ -633,12 +633,12 @@
# Read the list of module names from standard input
# (This kmp may already have been removed!)
- sed 's:^/usr::' > $tmpdir/modules-$kmp
+ cat > $tmpdir/modules-$kmp
check_kmp "$kmp" || return 1
local dir krel status system_map
- for dir in /lib/modules/*; do
- krel=${dir#/lib/modules/}
+ for dir in /usr/lib/modules/*; do
+ krel=${dir#/usr/lib/modules/}
case "$krel" in
*-$flavor)
;;
@@ -681,7 +681,7 @@
if [ $other_found -eq 1 ]; then
log "Weak-updates symlinks to no other $kmpshort package
could be created"
if [ $inconsistent -eq 1 ]; then
- echo "Warning: /lib/modules/$krel was inconsistent
before removal of $kmp" >&2
+ echo "Warning: /usr/lib/modules/$krel was inconsistent
before removal of $kmp" >&2
[ -s $tmpdir/unresolved-"$krel" ] && \
cat $tmpdir/unresolved-"$krel"
fi
++++++ suse-module-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.uWb8UB/_old 2023-09-06 18:57:53.898927817 +0200
+++ /var/tmp/diff_new_pack.uWb8UB/_new 2023-09-06 18:57:53.898927817 +0200
@@ -1,5 +1,5 @@
name: suse-module-tools
-version: 16.0.34
-mtime: 1693581664
-commit: 8f4b4329cd51f4156e097721d2e4f21c86939858
+version: 16.0.35
+mtime: 1693930606
+commit: c48173fba4679b2501faab4a6241b8a057b0490e
