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-02-01 14:02:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-module-tools (Old)
and /work/SRC/openSUSE:Factory/.suse-module-tools.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-module-tools"
Tue Feb 1 14:02:38 2022 rev:54 rq:949775 version:16.0.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-module-tools/suse-module-tools.changes
2022-01-05 13:40:01.993538819 +0100
+++
/work/SRC/openSUSE:Factory/.suse-module-tools.new.1898/suse-module-tools.changes
2022-02-01 14:03:06.528010318 +0100
@@ -1,0 +2,7 @@
+Fri Jan 28 21:00:00 UTC 2022 - Martin Wilck <mwi...@suse.com>
+
+- Update to version 16.0.19:
+ * Add /etc/modprobe.d/README on SLE/Leap (bsc#1195051)
+ * rpm-script: force-copy kernel to /boot (boo#1194501)
+
+-------------------------------------------------------------------
Old:
----
suse-module-tools-16.0.18.obscpio
New:
----
suse-module-tools-16.0.19.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-module-tools.spec ++++++
--- /var/tmp/diff_new_pack.a3JAd3/_old 2022-02-01 14:03:07.016006973 +0100
+++ /var/tmp/diff_new_pack.a3JAd3/_new 2022-02-01 14:03:07.024006918 +0100
@@ -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.18
+Version: 16.0.19
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -108,6 +108,20 @@
%install
install -d -m 755 "%{buildroot}%{modprobe_dir}"
install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d"
+# keep /etc clean on Tumbleweed
+%if 0%{?suse_version} < 1550
+cat > "%{buildroot}%{_sysconfdir}/modprobe.d/README" <<EOF
+Local configuration for modprobe(8)
+===================================
+
+The distribution-provided modprobe configuration files have moved to
%{modprobe_dir}.
+To modify the configuration, copy files from %{modprobe_dir} to this directory
+(%{_sysconfdir}/modprobe.d) and edit them here.
+
+See also %{modprobe_dir}/README, %{_defaultdocdir}/%{name}/README.md, and the
+man page modprobe.d(5).
+EOF
+%endif
install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/common/*.conf
if [ -d modprobe.conf/%{_arch} ]; then
install -pm644 -t "%{buildroot}%{modprobe_dir}"
modprobe.conf/%{_arch}/*.conf
@@ -246,6 +260,7 @@
%{depmod_dir}
%dir %{_sysconfdir}/depmod.d
%if 0%{?suse_version} < 1550
+%{_sysconfdir}/modprobe.d/README
%{_rpmmacrodir}/macros.initrd
%endif
%{_bindir}/kmp-install
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.a3JAd3/_old 2022-02-01 14:03:07.060006672 +0100
+++ /var/tmp/diff_new_pack.a3JAd3/_new 2022-02-01 14:03:07.064006644 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/suse-module-tools.git</param>
- <param
name="changesrevision">d6673b607cbaaa15cd9622a0a4f8a9f98efa5676</param></service></servicedata>
+ <param
name="changesrevision">3d244d5dfc0e5c3d5c8a7cc90d8e9e81be6577c1</param></service></servicedata>
(No newline at EOF)
++++++ suse-module-tools-16.0.18.obscpio -> suse-module-tools-16.0.19.obscpio
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/suse-module-tools-16.0.18/kernel-scriptlets/rpm-script
new/suse-module-tools-16.0.19/kernel-scriptlets/rpm-script
--- old/suse-module-tools-16.0.18/kernel-scriptlets/rpm-script 2022-01-04
14:28:12.000000000 +0100
+++ new/suse-module-tools-16.0.19/kernel-scriptlets/rpm-script 2022-01-28
21:35:51.000000000 +0100
@@ -193,13 +193,15 @@
# if /boot and /usr are not speparate partitions we can just link
# the kernel there to save space. Otherwise copy.
if mountpoint -q /boot || mountpoint -q /usr; then
- copy_or_link="cp -a"
+ copy_or_link="cp -a --remove-destination"
+ separate_boot='1'
else
copy_or_link="ln -sf"
+ separate_boot=""
fi
# XXX: need to fix suse-module-tools for sysctl.conf and System.map
for x in "$image" sysctl.conf System.map config; do
- if [ ! -e /boot/$x-"$kernelrelease"-"$flavor" ]; then
+ if [ "$separate_boot" = 1 ] || [ ! -e
/boot/$x-"$kernelrelease"-"$flavor" ]; then
$copy_or_link .."$modules_dir"/$x
/boot/$x-"$kernelrelease"-"$flavor" || script_rc=$?
if [ -e "$modules_dir"/.$x.hmac ]; then
$copy_or_link .."$modules_dir"/.$x.hmac
/boot/.$x-"$kernelrelease"-"$flavor".hmac || script_rc=$?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-module-tools-16.0.18/suse-module-tools.spec
new/suse-module-tools-16.0.19/suse-module-tools.spec
--- old/suse-module-tools-16.0.18/suse-module-tools.spec 2022-01-04
14:28:12.000000000 +0100
+++ new/suse-module-tools-16.0.19/suse-module-tools.spec 2022-01-28
21:35:51.000000000 +0100
@@ -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.18
+Version: 16.0.19
Release: 0
Summary: Configuration for module loading and SUSE-specific utilities
for KMPs
License: GPL-2.0-or-later
@@ -108,6 +108,20 @@
%install
install -d -m 755 "%{buildroot}%{modprobe_dir}"
install -d -m 755 "%{buildroot}%{_sysconfdir}/modprobe.d"
+# keep /etc clean on Tumbleweed
+%if 0%{?suse_version} < 1550
+cat > "%{buildroot}%{_sysconfdir}/modprobe.d/README" <<EOF
+Local configuration for modprobe(8)
+===================================
+
+The distribution-provided modprobe configuration files have moved to
%{modprobe_dir}.
+To modify the configuration, copy files from %{modprobe_dir} to this directory
+(%{_sysconfdir}/modprobe.d) and edit them here.
+
+See also %{modprobe_dir}/README, %{_defaultdocdir}/%{name}/README.md, and the
+man page modprobe.d(5).
+EOF
+%endif
install -pm644 -t "%{buildroot}%{modprobe_dir}" modprobe.conf/common/*.conf
if [ -d modprobe.conf/%{_arch} ]; then
install -pm644 -t "%{buildroot}%{modprobe_dir}"
modprobe.conf/%{_arch}/*.conf
@@ -246,6 +260,7 @@
%{depmod_dir}
%dir %{_sysconfdir}/depmod.d
%if 0%{?suse_version} < 1550
+%{_sysconfdir}/modprobe.d/README
%{_rpmmacrodir}/macros.initrd
%endif
%{_bindir}/kmp-install
++++++ suse-module-tools.obsinfo ++++++
--- /var/tmp/diff_new_pack.a3JAd3/_old 2022-02-01 14:03:07.188005794 +0100
+++ /var/tmp/diff_new_pack.a3JAd3/_new 2022-02-01 14:03:07.196005739 +0100
@@ -1,5 +1,5 @@
name: suse-module-tools
-version: 16.0.18
-mtime: 1641302892
-commit: d6673b607cbaaa15cd9622a0a4f8a9f98efa5676
+version: 16.0.19
+mtime: 1643402151
+commit: 3d244d5dfc0e5c3d5c8a7cc90d8e9e81be6577c1
