Hello community,
here is the log from the commit of package suse-module-tools for
openSUSE:Factory checked in at 2019-07-13 13:34:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Sat Jul 13 13:34:07 2019 rev:29 rq:712919 version:15.2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2019-05-17 23:35:39.326157038 +0200
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.4615/suse-module-tools.changes
2019-07-13 13:34:08.779339829 +0200
@@ -1,0 +2,27 @@
+Mon Jul 01 20:18:55 UTC 2019 - mwi...@suse.com
+
+- Update to version 15.2.3:
+ * softdep of bridge on br_netfilter (bsc#937216, bsc#1134819)
+
+-------------------------------------------------------------------
+Tue Jun 18 13:08:07 UTC 2019 - mwi...@suse.com
+
+- Update to version 15.2.2:
+ * kmp-install, driver-check.sh, weak-modules2:
+ Support for compressed kernel modules (bsc#1135854)
+
+-------------------------------------------------------------------
+Fri Jun 14 14:52:19 UTC 2019 - mwi...@suse.com
+
+- Update to version 15.2.1:
+- Install sg.conf under /usr/lib/modules-load.d (bsc#1036463)
+ * sg.conf: avoid file conflict with systemd
+
+-------------------------------------------------------------------
+Fri Jun 14 10:06:55 UTC 2019 - mwi...@suse.com
+
+- Update to version 15.2.0:
+ * weak-modules2: emit "inconsistent" warning only if replacement fails
+ (bsc#1127155)
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-15.1.13.tar.xz
New:
----
suse-module-tools-15.2.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.J6YEN1/_old 2019-07-13 13:34:09.235339708 +0200
+++ /var/tmp/diff_new_pack.J6YEN1/_new 2019-07-13 13:34:09.235339708 +0200
@@ -16,6 +16,10 @@
#
+# Define _rpmmacrodir if it's not defined yet
+%{!?_rpmmacrodir: %global _rpmmacrodir %{_rpmconfigdir}/macros.d}
+%define modules_load_dir /usr/lib/modules-load.d
+
# List of legacy file systems to be blacklisted by default
%if 0%{?is_opensuse}
%global fs_blacklist adfs affs bfs befs cramfs efs erofs exofs freevxfs f2fs
hfs hpfs jfs minix nilfs2 ntfs omfs qnx4 qnx6 sysv ufs
@@ -25,7 +29,7 @@
%endif
Name: suse-module-tools
-Version: 15.1.13
+Version: 15.2.3
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -121,8 +125,8 @@
# 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}%{_sysconfdir}/modules-load.d"
-install -pm 644 sg.conf "%{buildroot}%{_sysconfdir}/modules-load.d"
+install -d -m 755 "%{buildroot}%{modules_load_dir}"
+install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}"
mkdir -p %{buildroot}%{_defaultlicensedir}
@@ -259,8 +263,8 @@
%{_libexecdir}/module-init-tools
%exclude %{_libexecdir}/module-init-tools/weak-modules
%{_libexecdir}/systemd/system/systemd-sysctl.service.d
-%dir %{_sysconfdir}/modules-load.d
-%config(noreplace) %{_sysconfdir}/modules-load.d/sg.conf
+%dir %{modules_load_dir}
+%{modules_load_dir}/sg.conf
%files legacy
%defattr(-,root,root)
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.J6YEN1/_old 2019-07-13 13:34:09.267339700 +0200
+++ /var/tmp/diff_new_pack.J6YEN1/_new 2019-07-13 13:34:09.267339700 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/suse-module-tools.git</param>
- <param
name="changesrevision">53810546ce76fb4a95fe2cb4ce6a08f41dafb797</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">22cf1c54dbe945eb9554b79be090413ad82a16ef</param></service></servicedata>
\ No newline at end of file
++++++ suse-module-tools-15.1.13.tar.xz -> suse-module-tools-15.2.3.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.1.13/driver-check.sh
new/suse-module-tools-15.2.3/driver-check.sh
--- old/suse-module-tools-15.1.13/driver-check.sh 2019-03-14
16:58:47.000000000 +0100
+++ new/suse-module-tools-15.2.3/driver-check.sh 2019-07-01
22:14:55.000000000 +0200
@@ -176,7 +176,7 @@
if ! rpm -q -R "$kmp" | grep -Eq "$req_re"; then
error "$kmp does not have proper dependencies"
fi
- exec 3< <(sed -rn 's:^(/lib/modules)?/([^/]*)/(.*\.ko)$:\1 \2 \3:p' \
+ exec 3< <(sed -rn 's:^(/lib/modules)?/([^/]*)/(.*\.ko(\.[gx]z)?)$:\1 \2
\3:p' \
"$tmp/rpms/$kmp")
while read prefix krel path <&3; do
found_module=true
@@ -331,7 +331,7 @@
check_krel "$krel"
done
-modules=($(find /lib/modules/ -name '*.ko'))
+modules=($(find /lib/modules/ -name '*.ko' -o -name '*.ko.[gx]z'))
for module in "${modules[@]}"; do
check_ko "$module"
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.1.13/kmp-install
new/suse-module-tools-15.2.3/kmp-install
--- old/suse-module-tools-15.1.13/kmp-install 2019-03-14 16:58:47.000000000
+0100
+++ new/suse-module-tools-15.2.3/kmp-install 2019-07-01 22:14:55.000000000
+0200
@@ -59,7 +59,7 @@
sub add_module {
my ($package, $path) = @_;
- return unless $path =~ m@^/lib/modules/([^/]+)/.*/([^/]+\.ko)$@;
+ return unless $path =~
m@^/lib/modules/([^/]+)/.*/([^/]+\.ko(\.[gx]z)?)$@;
my ($version, $name) = ($1, $2);
$name =~ s/-/_/g;
$package->{modules} ||= [];
@@ -74,7 +74,7 @@
while (<$pipe>) {
chomp;
my ($n, $v, $r, $a, $file) = split(' ');
- next unless $file =~ m@^/lib/modules/.*/.*/.*\.ko$@;
+ next unless $file =~ m@^/lib/modules/.*/.*/.*\.ko(\.[gx]z)?$@;
my $nvra = "$n-$v-$r.$a";
if (!exists($seen{$nvra})) {
add_package($res, [$n, "$v-$r", $a]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.1.13/macros.initrd
new/suse-module-tools-15.2.3/macros.initrd
--- old/suse-module-tools-15.1.13/macros.initrd 2019-03-14 16:58:47.000000000
+0100
+++ new/suse-module-tools-15.2.3/macros.initrd 2019-07-01 22:14:55.000000000
+0200
@@ -10,6 +10,6 @@
%regenerate_initrd_posttrans \
if test -x /usr/lib/module-init-tools/regenerate-initrd-posttrans; then
\
- /bin/bash -${-/e/}
/usr/lib/module-init-tools/regenerate-initrd-posttrans \
+ /bin/bash -c 'set +e;
/usr/lib/module-init-tools/regenerate-initrd-posttrans' \
fi \
%nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-15.1.13/modprobe.conf/modprobe.conf.common
new/suse-module-tools-15.2.3/modprobe.conf/modprobe.conf.common
--- old/suse-module-tools-15.1.13/modprobe.conf/modprobe.conf.common
2019-03-14 16:58:47.000000000 +0100
+++ new/suse-module-tools-15.2.3/modprobe.conf/modprobe.conf.common
2019-07-01 22:14:55.000000000 +0200
@@ -95,4 +95,9 @@
# SUSE INITRD: csiostor REQUIRES cxgb4
softdep csiostor pre: cxgb4
+# Since kernel 3.18 br_netfilter is needed to pass bridged packets to
+# netfilter. Load br_netfilter automatically to avoid regressions in SLE12 SP2+
+# service packs (bsc#937216).
+softdep bridge post: br_netfilter
+
# end of common part for modprobe.conf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.1.13/sg.conf
new/suse-module-tools-15.2.3/sg.conf
--- old/suse-module-tools-15.1.13/sg.conf 2019-03-14 16:58:47.000000000
+0100
+++ new/suse-module-tools-15.2.3/sg.conf 2019-07-01 22:14:55.000000000
+0200
@@ -1,3 +1,2 @@
# load sg module at boot time
-# the line below can be removed or commented out on non-SCSI systems
sg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-15.1.13/weak-modules2
new/suse-module-tools-15.2.3/weak-modules2
--- old/suse-module-tools-15.1.13/weak-modules2 2019-03-14 16:58:47.000000000
+0100
+++ new/suse-module-tools-15.2.3/weak-modules2 2019-07-01 22:14:55.000000000
+0200
@@ -92,7 +92,7 @@
}
filter_basenames() {
- sed -rn 's:.*\<lib/modules/.*/([^/]*\.ko)$:\1:p'
+ sed -rn 's:.*\<lib/modules/.*/([^/]*\.ko(\.[gx]z)?)$:\1:p'
}
# Name of the symlink that makes a module available to a given kernel
@@ -271,7 +271,7 @@
continue
fi
rpm -ql --nodigest --nosignature "$kmp" \
- | grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \
+ | grep -Ee '^/lib/modules/[^/]+/.+\.ko(\.[gx]z)?$' \
> $tmpdir/modules-$kmp
if [ $? != 0 ]; then
echo "WARNING: $kmp does not contain any kernel modules" >&2
@@ -546,11 +546,14 @@
continue
esac
[ -d $dir -a -f /boot/System.map-$krel ] || 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
- fi
if kmp_is_present $kmp $krel; then
+ local other_found=0 inconsistent=0
+
+ if opt_debug=1 has_unresolved_symbols "$krel" "/" \
+ >$tmpdir/unresolved-"$krel" 2>&1; then
+ inconsistent=1
+ fi
+
if [ $krel != "$(cat $tmpdir/krel-$kmp)" ]; then
remove_kmp_modules "$kmp" "$krel"
fi
@@ -559,6 +562,7 @@
while read other_kmp; do
[ "$kmp" != "$other_kmp" ] || continue
+ other_found=1
if can_replace_kmp "" "$other_kmp" "$krel"; then
add_kmp_modules "$other_kmp" "$krel"
break
@@ -570,9 +574,18 @@
| run_depmod_and_mkinitrd "$krel" || status=1
else
log "Package $kmp removed from kernel $krel"
+ 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
+ [ -s $tmpdir/unresolved-"$krel" ] && \
+ cat $tmpdir/unresolved-"$krel"
+ fi
+ fi
run_depmod_and_mkinitrd "$krel" <$tmpdir/basenames-$kmp || \
status=1
fi
+ rm -f $tmpdir/unresolved-"$krel"
fi
done
return $status
