Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2023-08-15 16:39:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new.11712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmod" Tue Aug 15 16:39:10 2023 rev:78 rq:1103741 version:30 Changes: -------- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2023-07-25 11:22:59.067593043 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new.11712/kmod.changes 2023-08-15 16:39:11.770655580 +0200 @@ -1,0 +2,7 @@ +Mon Jul 24 12:50:23 UTC 2023 - Michal Suchanek <msucha...@suse.de> + +- Remove compatibility patches, add README.usrmerge (boo#1212835). + * Delete Provide-fallback-for-successfully-running-make-modules_install.patch + * Delete compat-module_directory-module_prefix.patch + +------------------------------------------------------------------- Old: ---- Provide-fallback-for-successfully-running-make-modules_install.patch compat-module_directory-module_prefix.patch New: ---- README.usrmerge ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.twa91H/_old 2023-08-15 16:39:12.882663164 +0200 +++ /var/tmp/diff_new_pack.twa91H/_new 2023-08-15 16:39:12.890663218 +0200 @@ -50,9 +50,7 @@ Patch14: kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch Patch15: usr-lib-modules.patch Patch16: no-stylesheet-download.patch -Patch17: Provide-fallback-for-successfully-running-make-modules_install.patch -Patch18: compat-module_directory-module_prefix.patch -Patch19: configure-Detect-openssl-sm3-support.patch +Patch17: configure-Detect-openssl-sm3-support.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-xsl-stylesheets ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.twa91H/_old 2023-08-15 16:39:12.914663382 +0200 +++ /var/tmp/diff_new_pack.twa91H/_new 2023-08-15 16:39:12.918663409 +0200 @@ -34,6 +34,7 @@ Source: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz Source2: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign Source3: %name.keyring +Source4: README.usrmerge Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch @@ -50,9 +51,7 @@ Patch14: kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch Patch15: usr-lib-modules.patch Patch16: no-stylesheet-download.patch -Patch17: Provide-fallback-for-successfully-running-make-modules_install.patch -Patch18: compat-module_directory-module_prefix.patch -Patch19: configure-Detect-openssl-sm3-support.patch +Patch17: configure-Detect-openssl-sm3-support.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-xsl-stylesheets @@ -124,6 +123,7 @@ %prep %autosetup -p1 +cp %{SOURCE4} . %build GTKDOCIZE=/bin/true autoreconf -fi @@ -175,6 +175,9 @@ %postun -n %lname -p /sbin/ldconfig %files +%if 0%{?suse_version} > 1500 +%doc README.usrmerge +%endif %_bindir/kmod %_bindir/lsmod %_sbindir/depmod ++++++ README.usrmerge ++++++ The Tumbleweed kmod and kernel are patched to install modules into /usr/lib/modules (the --with-module-directory configure argument.) This is not compatible with upstream kernel, and upstream rejected patch to make the kernel build system detect this. Suggested solution is to use make MODLIB='$(INSTALL_MOD_PATH)/usr/lib/modules/$(KERNELRELEASE)' when building the upstream kernel.
