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 2022-06-03 14:16:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Fri Jun 3 14:16:42 2022 rev:55 rq:980502 version:16.0.20
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2022-02-01 14:03:06.528010318 +0100
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.1548/suse-module-tools.changes
2022-06-03 14:16:46.929325514 +0200
@@ -1,0 +2,9 @@
+Thu Jun 2 10:55:37 UTC 2022 - Martin Wilck <mwi...@suse.com>
+
+- Update to version 16.0.20:
+ * Bump version to 16.0.20
+ * driver-check.sh: avoid false positive error messages (boo#1200107)
+ * don't hardcode /boot for kernel-related files (boo#1199873)
+ * spec file: use "install -p" consistently
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-16.0.19.obscpio
New:
----
suse-module-tools-16.0.20.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.9nkwXG/_old 2022-06-03 14:16:47.433326169 +0200
+++ /var/tmp/diff_new_pack.9nkwXG/_new 2022-06-03 14:16:47.437326174 +0200
@@ -45,7 +45,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.19
+Version: 16.0.20
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -169,26 +169,25 @@
install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d"
echo '[Unit]' >"%{buildroot}%{sysctl_dropin}"
%if %{with kernel_sysctl}
-install -m 644 kernel-sysctl.service "%{buildroot}%{_unitdir}"
+install -pm 644 kernel-sysctl.service "%{buildroot}%{_unitdir}"
echo 'Wants=kernel-sysctl.service' >>"%{buildroot}%{sysctl_dropin}"
%endif
%if %{with boot_sysctl}
-install -m 644 boot-sysctl.service "%{buildroot}%{_unitdir}"
+install -pm 644 boot-sysctl.service "%{buildroot}%{_unitdir}"
echo 'Wants=boot-sysctl.service' >>"%{buildroot}%{sysctl_dropin}"
%endif
-# Ensure that the sg driver is loaded early (bsc#1036463)
-# Not needed in SLE11, where sg is loaded via udev rule.
install -d -m 755 "%{buildroot}%{_modulesloaddir}"
-install -pm 644 sg.conf "%{buildroot}%{_modulesloaddir}"
+install -pm 644 -t "%{buildroot}%{_modulesloaddir}" modules-load.d/*.conf
+
%ifarch ppc64 ppc64le
install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators
-install -m 755 udev-trigger-generator
%{buildroot}/usr/lib/systemd/system-generators
+install -pm 755 udev-trigger-generator
%{buildroot}/usr/lib/systemd/system-generators
%endif
# udev rules (formerly system-tuning-common-SUSE, udev-extra-rules)
install -d -m 755 %{buildroot}%{_udevrulesdir}
-install -m 644 udevrules/*.rules %{buildroot}%{_udevrulesdir}
+install -pm 644 udevrules/*.rules %{buildroot}%{_udevrulesdir}
mkdir -p %{buildroot}%{_defaultlicensedir}
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.9nkwXG/_old 2022-06-03 14:16:47.473326221 +0200
+++ /var/tmp/diff_new_pack.9nkwXG/_new 2022-06-03 14:16:47.477326226 +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">3d244d5dfc0e5c3d5c8a7cc90d8e9e81be6577c1</param></service></servicedata>
+ <param
name="changesrevision">7272c960f4b8d3a07cf5ac5c1a946df876c488c7</param></service></servicedata>
(No newline at EOF)
++++++ suse-module-tools-16.0.19.obscpio -> suse-module-tools-16.0.20.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.19/.gitignore
new/suse-module-tools-16.0.20/.gitignore
--- old/suse-module-tools-16.0.19/.gitignore 1970-01-01 01:00:00.000000000
+0100
+++ new/suse-module-tools-16.0.20/.gitignore 2022-06-02 10:56:33.000000000
+0200
@@ -0,0 +1,5 @@
+*~
+\#*
+*.rej
+*.orig
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.19/.obs/workflows.yml
new/suse-module-tools-16.0.20/.obs/workflows.yml
--- old/suse-module-tools-16.0.19/.obs/workflows.yml 2022-01-28
21:35:51.000000000 +0100
+++ new/suse-module-tools-16.0.20/.obs/workflows.yml 2022-06-02
10:56:33.000000000 +0200
@@ -1,6 +1,48 @@
workflow:
- steps:
- - branch_package:
- source_project: home:mwilck:suse-module-tools
- source_package: suse-module-tools
- target_project: home:mwilck
+ steps:
+ - branch_package:
+ source_project: home:mwilck:suse-module-tools
+ source_package: suse-module-tools
+ target_project: home:mwilck
+ - configure_repositories:
+ project: home:mwilck
+ repositories:
+ - name: openSUSE_Tumbleweed
+ paths:
+ - target_project: openSUSE:Factory
+ target_repository: snapshot
+ architectures:
+ - x86_64
+ - i586
+ - name: openSUSE_Leap_15.4
+ paths:
+ - target_project: openSUSE:Tools
+ target_repository: 15.4
+ - target_project: openSUSE:Leap:15.4
+ target_repository: standard
+ architectures:
+ - x86_64
+ - name: SLE_15_SP4
+ paths:
+ - target_project: openSUSE:Tools
+ target_repository: 15.4
+ - target_project: SUSE:SLE-15-SP4:GA
+ target_repository: pool
+ architectures:
+ - x86_64
+ - s390x
+ - ppc64le
+ - aarch64
+ - name: SLE_15_SP3
+ paths:
+ - target_project: openSUSE:Tools
+ target_repository: 15.3
+ - target_project: SUSE:SLE-15-SP3:GA
+ target_repository: pool
+ architectures:
+ - x86_64
+ - s390x
+ - ppc64le
+ - aarch64
+ filters:
+ event: pull_request
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.19/driver-check.sh
new/suse-module-tools-16.0.20/driver-check.sh
--- old/suse-module-tools-16.0.19/driver-check.sh 2022-01-28
21:35:51.000000000 +0100
+++ new/suse-module-tools-16.0.20/driver-check.sh 2022-06-02
10:56:33.000000000 +0200
@@ -10,6 +10,22 @@
trap 'rm -rf "$tmp"' EXIT
tmp=$(mktemp -d)
+find_usrmerge_boot() {
+ local filename=$1
+ local kver=$2
+ local ext=${3:+."$3"}
+ local f
+
+ for f in "/usr/lib/modules/$kver/$filename$ext" "/boot/$filename-$kver$ext"
+ do
+ if [ -e "$f" ]; then
+ echo "$f"
+ return
+ fi
+ done
+ echo "WARNING: find_usrmerge_boot: $filename$ext not found for kernel
$kver" >&2
+}
+
find_depmod() {
local _d
@@ -115,7 +131,7 @@
if ! rpm -q --qf '%{description}\n' "$kernel" | grep -q '^GIT '; then
error "$kernel does not look like a SUSE kernel package (no
commit id)"
fi
- if ! rpm -q --qf '%{postin}\n' "$kernel" | grep -q 'weak-modules2'; then
+ if ! rpm -q --qf '%{postin}\n' "$kernel" | egrep -Eq
'weak-modules2|kernel-scriptlets/rpm-post'; then
error "$kernel does not look like a SUSE kernel package (wrong
%post script)"
fi
}
@@ -125,8 +141,8 @@
local krel=$1 system_map module_symvers msg res args bad=false
local mit_version
- system_map="/boot/System.map-$krel"
- module_symvers="/boot/symvers-$krel.gz"
+ system_map=$(find_usrmerge_boot System.map "$krel")
+ module_symvers=$(find_usrmerge_boot symvers "$krel" gz)
if ! test -e "$system_map"; then
error "$system_map not found"
bad=true
@@ -136,7 +152,7 @@
bad=true
fi
if $bad; then
- explain "Each kernel must install /boot/System.map-\$version
and /boot/symvers-\$version.gz to be able to check module dependencies."
+ explain "Each kernel must install System.map and symvers.gz to
be able to check module dependencies."
return
fi
set -- $("$DEPMOD" --version | sed -rn 's/.*
([0-9]+)(\.([0-9]+)(\..*)?)?/\1 \3/p')
@@ -170,7 +186,7 @@
{
local kmp=$1 prefix prev_krel krel path found_module=false
- if ! rpm -q --qf '%{postin}\n' "$kmp" | grep -q 'weak-modules2'; then
+ if ! rpm -q --qf '%{postin}\n' "$kmp" | egrep -Eq
'weak-modules2|kernel-scriptlets/kmp-post'; then
error "$kmp does not look like a SUSE kernel module package
(wrong %post)"
fi
if ! rpm -q -R "$kmp" | grep -Eq "$req_re"; then
@@ -305,7 +321,7 @@
case "$rpm" in
kernel-source-* | kernel-syms-* | kernel-*-debug* | kernel-*-man-* | \
kernel-*-devel-* | kernel-firmware-* | kernel-coverage-* | \
- kernel-docs-* | kernel-devel-* | kernel-macros-*)
+ kernel-docs-* | kernel-devel-* | kernel-macros-* |
kernel-install-tools-*)
continue
esac
# store the filelist to speed up file_owner()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.19/modules-load.d/sg.conf
new/suse-module-tools-16.0.20/modules-load.d/sg.conf
--- old/suse-module-tools-16.0.19/modules-load.d/sg.conf 1970-01-01
01:00:00.000000000 +0100
+++ new/suse-module-tools-16.0.20/modules-load.d/sg.conf 2022-06-02
10:56:33.000000000 +0200
@@ -0,0 +1,2 @@
+# Ensure that the sg driver is loaded early (bsc#1036463)
+sg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.19/sg.conf
new/suse-module-tools-16.0.20/sg.conf
--- old/suse-module-tools-16.0.19/sg.conf 2022-01-28 21:35:51.000000000
+0100
+++ new/suse-module-tools-16.0.20/sg.conf 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-sg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.19/suse-module-tools.spec
new/suse-module-tools-16.0.20/suse-module-tools.spec
--- old/suse-module-tools-16.0.19/suse-module-tools.spec 2022-01-28
21:35:51.000000000 +0100
+++ new/suse-module-tools-16.0.20/suse-module-tools.spec 2022-06-02
10:56:33.000000000 +0200
@@ -45,7 +45,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.19
+Version: 16.0.20
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -169,26 +169,25 @@
install -d -m 755 "%{buildroot}%{_unitdir}/systemd-sysctl.service.d"
echo '[Unit]' >"%{buildroot}%{sysctl_dropin}"
%if %{with kernel_sysctl}
-install -m 644 kernel-sysctl.service "%{buildroot}%{_unitdir}"
+install -pm 644 kernel-sysctl.service "%{buildroot}%{_unitdir}"
echo 'Wants=kernel-sysctl.service' >>"%{buildroot}%{sysctl_dropin}"
%endif
%if %{with boot_sysctl}
-install -m 644 boot-sysctl.service "%{buildroot}%{_unitdir}"
+install -pm 644 boot-sysctl.service "%{buildroot}%{_unitdir}"
echo 'Wants=boot-sysctl.service' >>"%{buildroot}%{sysctl_dropin}"
%endif
-# Ensure that the sg driver is loaded early (bsc#1036463)
-# Not needed in SLE11, where sg is loaded via udev rule.
install -d -m 755 "%{buildroot}%{_modulesloaddir}"
-install -pm 644 sg.conf "%{buildroot}%{_modulesloaddir}"
+install -pm 644 -t "%{buildroot}%{_modulesloaddir}" modules-load.d/*.conf
+
%ifarch ppc64 ppc64le
install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators
-install -m 755 udev-trigger-generator
%{buildroot}/usr/lib/systemd/system-generators
+install -pm 755 udev-trigger-generator
%{buildroot}/usr/lib/systemd/system-generators
%endif
# udev rules (formerly system-tuning-common-SUSE, udev-extra-rules)
install -d -m 755 %{buildroot}%{_udevrulesdir}
-install -m 644 udevrules/*.rules %{buildroot}%{_udevrulesdir}
+install -pm 644 udevrules/*.rules %{buildroot}%{_udevrulesdir}
mkdir -p %{buildroot}%{_defaultlicensedir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.19/weak-modules2
new/suse-module-tools-16.0.20/weak-modules2
--- old/suse-module-tools-16.0.19/weak-modules2 2022-01-28 21:35:51.000000000
+0100
+++ new/suse-module-tools-16.0.20/weak-modules2 2022-06-02 10:56:33.000000000
+0200
@@ -91,6 +91,22 @@
dlog "DEPMOD=$DEPMOD"
}
+find_usrmerge_boot() {
+ local filename=$1
+ local kver=$2
+ local ext=${3:+."$3"}
+ local f
+
+ for f in "/usr/lib/modules/$kver/$filename$ext" "/boot/$filename-$kver$ext"
+ do
+ if [ -e "$f" ]; then
+ echo "$f"
+ return
+ fi
+ done
+ log "WARNING: find_usrmerge_boot: $filename$ext not found for kernel $kver"
+}
+
log() {
[ $opt_verbose -gt 0 ] && echo "$@" >&2
return 0
@@ -197,20 +213,23 @@
has_unresolved_symbols() {
local krel=$1 basedir=$2 output status args sym_errors _f
- if [ ! -e $tmpdir/symvers-$krel ]; then
- for _f in /boot/symvers-$krel.gz /usr/lib/modules/$krel/symvers.gz; do
- if [ -e $_f ]; then
- dlog "has_unresolved_symbols: found $_f"
- zcat $_f >$tmpdir/symvers-$krel
- break
- fi
- done
+ if [ ! -e "$tmpdir/symvers-$krel" ]; then
+ _f=$(find_usrmerge_boot symvers "$krel" gz)
+ if [ -n "$_f" ]; then
+ dlog "has_unresolved_symbols: found $_f"
+ zcat "$_f" >"$tmpdir/symvers-$krel"
+ fi
fi
if [ -e $tmpdir/symvers-$krel ]; then
args=(-E $tmpdir/symvers-$krel)
else
- echo "warning: $tmpdir/symvers-$krel not available" >&2
- args=(-F /boot/System.map-$krel)
+ echo "WARNING: symvers.gz not found for $krel, symbol resolution will
be unreliable" >&2
+ _f=$(find_usrmerge_boot System.map "$krel")
+ if [ -n "$_f" ]; then
+ args=(-F "$_f")
+ else
+ echo "WARNING: System.map not found for $krel, symbol resolution
may fail" >&2
+ fi
fi
output="$("$DEPMOD" -b "$basedir" -ae "${args[@]}" $krel 2>&1)"
status=$?
@@ -434,17 +453,19 @@
run_depmod_build_initrd() {
local krel=$1
local status=0
+ local system_map
- if [ -d /lib/modules/$krel -a -f /boot/System.map-$krel ] ; then
- doit "$DEPMOD" -F /boot/System.map-$krel -ae $krel || return 1
+ if [ -d /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
+ fi
fi
if needs_initrd $krel; then
- local image
+ local image x
for x in vmlinuz image vmlinux linux bzImage uImage Image zImage; do
- if [ -f /boot/$x-$krel ]; then
- image=$x
- break
- fi
+ image=$(find_usrmerge_boot "$x" "$krel")
+ [ -z "$image" ] || break
done
if [ -n "$image" ]; then
if test -n "$INITRD_IN_POSTTRANS"; then
@@ -500,8 +521,9 @@
kernel_changed() {
local krel=$1 flavor=${1##*-}
+ local system_map=$(find_usrmerge_boot System.map "$krel")
- if [ ! -f /boot/System.map-$krel ]; then
+ if [ -z "$system_map" ]; then
# this kernel does not exist anymore
dlog "kernel_changed: kernel removed"
return 0
@@ -552,6 +574,7 @@
add_kmp() {
local kmp=$1 kmpshort=${1%-*-*}
local basename=${kmpshort%-kmp-*} flavor=${kmpshort##*-}
+ local system_map
# Find the kmp to be added as well as any previous versions
find_kmps "$basename" "$flavor" || return 1
@@ -566,7 +589,9 @@
continue
esac
dlog "add_kmp: processing $kmp for $krel"
- [ -d $dir -a -f /boot/System.map-$krel ] || continue
+ [ -d $dir ] || continue
+ 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: weak-updates symlinks might not be created" >&2
@@ -611,7 +636,7 @@
sed 's:^/usr::' > $tmpdir/modules-$kmp
check_kmp "$kmp" || return 1
- local dir krel status
+ local dir krel status system_map
for dir in /lib/modules/*; do
krel=${dir#/lib/modules/}
case "$krel" in
@@ -620,7 +645,9 @@
*)
continue
esac
- [ -d $dir -a -f /boot/System.map-$krel ] || continue
+ [ -d $dir ] || continue
+ system_map=$(find_usrmerge_boot System.map "$krel")
+ [ -n "$system_map" ] || continue
dlog "remove_kmp: processing $kmp for $krel"
if kmp_is_present $kmp $krel; then
local other_found=0 inconsistent=0
++++++ suse-module-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.9nkwXG/_old 2022-06-03 14:16:47.597326382 +0200
+++ /var/tmp/diff_new_pack.9nkwXG/_new 2022-06-03 14:16:47.597326382 +0200
@@ -1,5 +1,5 @@
name: suse-module-tools
-version: 16.0.19
-mtime: 1643402151
-commit: 3d244d5dfc0e5c3d5c8a7cc90d8e9e81be6577c1
+version: 16.0.20
+mtime: 1654160193
+commit: 7272c960f4b8d3a07cf5ac5c1a946df876c488c7
