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-07-25 11:22:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new.1467 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmod"
Tue Jul 25 11:22:53 2023 rev:77 rq:1100406 version:30
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2023-07-19
19:09:43.820249008 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new.1467/kmod.changes 2023-07-25
11:22:59.067593043 +0200
@@ -1,0 +2,12 @@
+Mon Jul 17 17:54:54 UTC 2023 - Michal Suchanek <msucha...@suse.de>
+
+- Use pkgconfig for kmod configuration.
+ * Delete kmod-Add-config-command-to-show-compile-time-configu.patch
+ * Add kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch,
+ Provide-fallback-for-successfully-running-make-modules_install.patch
+ compat-module_directory-module_prefix.patch.
+- Refresh usr-lib-modprobe.patch, usr-lib-modules.patch.
+- Add configure-Detect-openssl-sm3-support.patch to
+ fix build with older openssl without SM3 support.
+
+-------------------------------------------------------------------
Old:
----
kmod-Add-config-command-to-show-compile-time-configu.patch
New:
----
Provide-fallback-for-successfully-running-make-modules_install.patch
compat-module_directory-module_prefix.patch
configure-Detect-openssl-sm3-support.patch
kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmod-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.n1MKmu/_old 2023-07-25 11:22:59.911597966 +0200
+++ /var/tmp/diff_new_pack.n1MKmu/_new 2023-07-25 11:22:59.919598012 +0200
@@ -47,9 +47,12 @@
Patch11: depmod-Introduce-outdir-option.patch
Patch12: testsuite-Handle-different-sysconfdir.patch
Patch13: testsuite-depmod-use-defines-for-the-rootfs-lib_modu.patch
-Patch14: kmod-Add-config-command-to-show-compile-time-configu.patch
+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
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
@@ -95,7 +98,7 @@
--includedir="%_includedir/kmod" \
--with-rootlibdir="%_libdir" \
%if 0%{?suse_version} > 1500
- --with-module-prefix="%_prefix" \
+ --with-module-directory="%_prefix/lib/modules" \
%endif
--bindir="%_bindir"
%make_build KDIR="%kdir"
++++++ kmod.spec ++++++
--- /var/tmp/diff_new_pack.n1MKmu/_old 2023-07-25 11:22:59.939598129 +0200
+++ /var/tmp/diff_new_pack.n1MKmu/_new 2023-07-25 11:22:59.943598152 +0200
@@ -47,9 +47,12 @@
Patch11: depmod-Introduce-outdir-option.patch
Patch12: testsuite-Handle-different-sysconfdir.patch
Patch13: testsuite-depmod-use-defines-for-the-rootfs-lib_modu.patch
-Patch14: kmod-Add-config-command-to-show-compile-time-configu.patch
+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
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
@@ -137,7 +140,7 @@
--includedir="%_includedir/kmod" \
--with-rootlibdir="%_libdir" \
%if 0%{?suse_version} > 1500
- --with-module-prefix="%_prefix" \
+ --with-module-directory="%_prefix/lib/modules" \
%endif
--bindir="%_bindir"
%make_build
@@ -181,6 +184,7 @@
%_sbindir/modprobe
%_sbindir/rmmod
%_mandir/man[58]/*.[58]*
+%_libdir/pkgconfig/kmod.pc
%if 0%{?suse_version} < 1550
/bin/lsmod
/sbin/depmod
++++++ Provide-fallback-for-successfully-running-make-modules_install.patch
++++++
>From e15c268ba92d53dbb97fa0211696226656780713 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jeng...@inai.de>
Date: Sun, 16 Jul 2023 15:55:38 +0000
Subject: [PATCH 6/7] Provide fallback for successfully running `make
modules_install` in pristine tarballs.
---
tools/depmod.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tools/depmod.c b/tools/depmod.c
index 5ef490473186..70cfefb81005 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -3030,6 +3030,15 @@ static int do_depmod(int argc, char *argv[])
cfg.outdirnamelen = snprintf(cfg.outdirname, PATH_MAX,
"%s" MODULE_DIRECTORY "/%s",
out_root ?: (root ?: ""), cfg.kversion);
+ struct stat sb;
+ if (stat(cfg.dirname, &sb) != 0) {
+ cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
+ "%s/lib/modules/%s",
+ root ?: "", cfg.kversion);
+ cfg.outdirnamelen = snprintf(cfg.outdirname, PATH_MAX,
+ "%s/lib/modules/%s",
+ out_root ?: (root ?: ""), cfg.kversion);
+ }
if (optind == argc)
all = 1;
--
2.41.0
++++++ compat-module_directory-module_prefix.patch ++++++
>From 004a365112b56402cca5d0097fccb74d38490aeb Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msucha...@suse.de>
Date: Mon, 17 Jul 2023 12:56:45 +0200
Subject: [PATCH 7/7] compat: module_directory -> module_prefix
Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
Makefile.am | 1 +
configure.ac | 10 ++++++++++
tools/kmod.c | 15 +++++++++++++++
3 files changed, 26 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 1d51a43d68ba..e0df13c589bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDISTCONFDIR=\""$(distconfdir)"\" \
+ -DMODULE_PREFIX=\""$(module_prefix)"\" \
-DMODULE_DIRECTORY=\""$(module_directory)"\" \
${zlib_CFLAGS}
diff --git a/configure.ac b/configure.ac
index 602d3d3dbdf1..a1e64e190d2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,15 @@ AC_ARG_WITH([module_directory],
[], [with_module_directory=/lib/modules])
AC_SUBST([module_directory], [$with_module_directory])
+case $module_directory in
+ /lib/modules)
+ with_module_prefix=""
+ AC_SUBST([module_prefix], [$with_module_prefix]);;
+ */lib/modules) with_module_prefix=$(dirname $with_module_directory)
+ with_module_prefix=$(dirname $with_module_prefix)
+ AC_SUBST([module_prefix], [$with_module_prefix]);;
+esac
+
AC_ARG_WITH([zstd],
AS_HELP_STRING([--with-zstd], [handle Zstandard-compressed modules
@<:@default=disabled@:>@]),
[], [with_zstd=no])
@@ -324,6 +333,7 @@ AC_MSG_RESULT([
module_directory: ${module_directory}
prefix: ${prefix}
+ module_prefix: ${module_prefix}
sysconfdir: ${sysconfdir}
distconfdir: ${distconfdir}
libdir: ${libdir}
diff --git a/tools/kmod.c b/tools/kmod.c
index 55689c075ab1..1ab62e86116e 100644
--- a/tools/kmod.c
+++ b/tools/kmod.c
@@ -37,9 +37,11 @@ static const struct option options[] = {
};
static const struct kmod_cmd kmod_cmd_help;
+static const struct kmod_cmd kmod_cmd_config;
static const struct kmod_cmd *kmod_cmds[] = {
&kmod_cmd_help,
+ &kmod_cmd_config,
&kmod_cmd_list,
&kmod_cmd_static_nodes,
@@ -95,6 +97,19 @@ static const struct kmod_cmd kmod_cmd_help = {
.help = "Show help message",
};
+static int kmod_config(int argc, char *argv[])
+{
+ printf("{\"module_prefix\":\"" MODULE_PREFIX "\"}\n");
+
+ return EXIT_SUCCESS;
+}
+
+static const struct kmod_cmd kmod_cmd_config = {
+ .name = "config",
+ .cmd = kmod_config,
+ .help = "Show compile time options in JSON",
+};
+
static int handle_kmod_commands(int argc, char *argv[])
{
const char *cmd;
--
2.41.0
++++++ configure-Detect-openssl-sm3-support.patch ++++++
>From 90446ff0273775ee20762bb892fd3e901c8eb8ac Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msucha...@suse.de>
Date: Mon, 17 Jul 2023 21:23:51 +0200
Subject: [PATCH] configure: Detect openssl sm3 support
Older openssl versions do not support sm3. The code has an option to
disable the sm3 hash but the lack of openssl support is not detected
automatically.
Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
index a1e64e190d2f..5a582cb5a2af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,13 @@ AS_IF([test "x$with_openssl" != "xno"], [
PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.1.0])
AC_DEFINE([ENABLE_OPENSSL], [1], [Enable openssl for modinfo.])
module_signatures="PKCS7 $module_signatures"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <openssl/ssl.h>
+ int nid = NID_sm3;]])], [
+ AC_MSG_NOTICE([openssl supports sm3])
+ ], [
+ AC_MSG_NOTICE([openssl sm3 support not detected])
+ CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SM3"
+ ])
], [
AC_MSG_NOTICE([openssl support not requested])
])
--
2.41.0
++++++ kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch ++++++
>From 2e4eff4f252fe2a4c5bdb81e3ca2639b9b5f04c6 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msucha...@suse.de>
Date: Fri, 30 Jun 2023 16:16:24 +0200
Subject: [PATCH 3/7] kmod: Add pkgconfig file with kmod compile time
configuration
Show distconfdir (where system configuration files are searched/to be
installed), sysconfdir (where user configuration files are searched),
module compressions, and module signatures supported.
Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
v2: mention module signature in commit message
v3: add sysconfdir
v5: add distconfdir, switch to pkgconfig
---
Makefile.am | 6 +++---
configure.ac | 11 +++++++++++
tools/kmod.pc.in | 9 +++++++++
3 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 tools/kmod.pc.in
diff --git a/Makefile.am b/Makefile.am
index a03846d02b9c..18818c811634 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,9 +118,9 @@ libkmod_libkmod_internal_la_DEPENDENCIES =
$(libkmod_libkmod_la_DEPENDENCIES)
libkmod_libkmod_internal_la_LIBADD = $(libkmod_libkmod_la_LIBADD)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libkmod/libkmod.pc
-EXTRA_DIST += libkmod/libkmod.pc.in
-CLEANFILES += libkmod/libkmod.pc
+pkgconfig_DATA = libkmod/libkmod.pc tools/kmod.pc
+EXTRA_DIST += libkmod/libkmod.pc.in tools/kmod.pc.in
+CLEANFILES += libkmod/libkmod.pc tools/kmod.pc
bashcompletiondir=@bashcompletiondir@
dist_bashcompletion_DATA = \
diff --git a/configure.ac b/configure.ac
index 18206ccdb607..a6ed8a36ca70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,9 @@ LT_INIT([disable-static pic-only])
AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not
supported by kmod])])
AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile
is not supported by kmod])])
+module_compressions=""
+module_signatures="legacy"
+
#####################################################################
# Program checks and configurations
#####################################################################
@@ -93,6 +96,7 @@ AC_ARG_WITH([zstd],
AS_IF([test "x$with_zstd" != "xno"], [
PKG_CHECK_MODULES([libzstd], [libzstd >= 1.4.4])
AC_DEFINE([ENABLE_ZSTD], [1], [Enable Zstandard for modules.])
+ module_compressions="zstd $module_compressions"
], [
AC_MSG_NOTICE([Zstandard support not requested])
])
@@ -104,6 +108,7 @@ AC_ARG_WITH([xz],
AS_IF([test "x$with_xz" != "xno"], [
PKG_CHECK_MODULES([liblzma], [liblzma >= 4.99])
AC_DEFINE([ENABLE_XZ], [1], [Enable Xz for modules.])
+ module_compressions="xz $module_compressions"
], [
AC_MSG_NOTICE([Xz support not requested])
])
@@ -115,6 +120,7 @@ AC_ARG_WITH([zlib],
AS_IF([test "x$with_zlib" != "xno"], [
PKG_CHECK_MODULES([zlib], [zlib])
AC_DEFINE([ENABLE_ZLIB], [1], [Enable zlib for modules.])
+ module_compressions="gzip $module_compressions"
], [
AC_MSG_NOTICE([zlib support not requested])
])
@@ -126,6 +132,7 @@ AC_ARG_WITH([openssl],
AS_IF([test "x$with_openssl" != "xno"], [
PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.1.0])
AC_DEFINE([ENABLE_OPENSSL], [1], [Enable openssl for modinfo.])
+ module_signatures="PKCS7 $module_signatures"
], [
AC_MSG_NOTICE([openssl support not requested])
])
@@ -290,11 +297,15 @@ AC_DEFINE_UNQUOTED(KMOD_FEATURES, ["$with_features"],
[Features in this build])
# Generate files from *.in
#####################################################################
+AC_SUBST([module_compressions], $module_compressions)
+AC_SUBST([module_signatures], $module_signatures)
+
AC_CONFIG_FILES([
Makefile
man/Makefile
libkmod/docs/Makefile
libkmod/docs/version.xml
+ tools/kmod.pc
])
diff --git a/tools/kmod.pc.in b/tools/kmod.pc.in
new file mode 100644
index 000000000000..2595980a6b35
--- /dev/null
+++ b/tools/kmod.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+sysconfdir=@sysconfdir@
+distconfdir=@distconfdir@
+module_compressions=@module_compressions@
+module_signatures=@module_signatures@
+
+Name: kmod
+Description: Tools to deal with kernel modules
+Version: @VERSION@
--
2.41.0
++++++ man-depmod.d-Fix-incorrect-usr-lib-search-path.patch ++++++
--- /var/tmp/diff_new_pack.n1MKmu/_old 2023-07-25 11:23:00.063598852 +0200
+++ /var/tmp/diff_new_pack.n1MKmu/_new 2023-07-25 11:23:00.067598875 +0200
@@ -1,13 +1,15 @@
-From a792ef9a42b9bd8cc76260b4aa61a681f6998364 Mon Sep 17 00:00:00 2001
+From 7bf3543e3cc24dfc9ffca93d0469a5e0e60f8f29 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msucha...@suse.de>
Date: Fri, 30 Jun 2023 10:56:31 +0200
-Subject: [PATCH 1/9] man/depmod.d: Fix incorrect /usr/lib search path
+Subject: [PATCH 1/7] man/depmod.d: Fix incorrect /usr/lib search path
depmod searches /lib/depmod.d but the man page says /usr/lib/depmod.d is
-reached. Aling the documentation with the code.
+searched. Align the documentation with the code.
Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
+v2: Fix commit message typo
+---
man/depmod.d.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
++++++ no-stylesheet-download.patch ++++++
--- /var/tmp/diff_new_pack.n1MKmu/_old 2023-07-25 11:23:00.079598946 +0200
+++ /var/tmp/diff_new_pack.n1MKmu/_new 2023-07-25 11:23:00.083598969 +0200
@@ -1,7 +1,7 @@
-From cd775d005f7d36395ef554d128c849fac5430f37 Mon Sep 17 00:00:00 2001
+From b46c23e46ad9b19d74362eb3528404293bb03d12 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msucha...@suse.de>
Date: Mon, 6 Sep 2021 14:52:35 +0200
-Subject: [PATCH 9/9] Do not download the docbook stylesheet during build, use
+Subject: [PATCH 5/7] Do not download the docbook stylesheet during build, use
local copy instead.
Signed-off-by: Michal Suchanek <msucha...@suse.de>
@@ -10,7 +10,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/Makefile.am b/man/Makefile.am
-index 1a9a92f9c224..6b89400e9d39 100644
+index f550091a216a..a8ddb8bfd0ed 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -28,4 +28,4 @@ CLEANFILES = $(dist_man_MANS)
++++++ usr-lib-modprobe.patch ++++++
--- /var/tmp/diff_new_pack.n1MKmu/_old 2023-07-25 11:23:00.107599109 +0200
+++ /var/tmp/diff_new_pack.n1MKmu/_new 2023-07-25 11:23:00.111599132 +0200
@@ -1,71 +1,97 @@
-From 9d4c3adcd051408a9a4489984be73f9c06b938ab Mon Sep 17 00:00:00 2001
+From 88f6d08df8082f4dbe2407bef59de85290360e88 Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msucha...@suse.de>
Date: Tue, 12 Jan 2021 16:54:46 +0100
-Subject: [PATCH 2/9] libkmod, depmod: Load modprobe.d, depmod.d from
- $prefix/lib.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH 2/7] libkmod, depmod: Load modprobe.d, depmod.d from
+ ${prefix}/lib.
There is an ongoing effort to limit use of files outside of /usr (or
-$prefix on general). Currently all modprobe.d paths are hardcoded to
-outside of $prefix. Teach kmod to load modprobe.d from $prefix/lib.
+${prefix} on general). Currently all modprobe.d paths are hardcoded to
+outside of $prefix. Teach kmod to load modprobe.d from ${prefix}/lib.
On some distributions /usr/lib and /lib are the same directory because
of a compatibility symlink, and it is possible to craft configuration
files with sideeffects that would behave differently when loaded twice.
However, the override semantic ensures that one 'overrides' the other,
and only one configuration file of the same name is loaded from any of
-the seach directories.
+the search directories.
-Cc: Marcus Rückert <mrueck...@suse.com>
-Cc: Takashi Iwai <ti...@suse.com>
-Cc: Dominique Leuenberger <dims...@opensuse.org>
Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
+v2: Fix commit message typo
+v3: Fix modprobe.d path list in code comment
+v5: Add distconfdir
+---
Makefile.am | 1 +
- libkmod/libkmod.c | 3 ++-
+ configure.ac | 5 +++++
+ libkmod/libkmod.c | 7 ++++---
man/Makefile.am | 9 +++++++--
man/depmod.d.xml | 1 +
man/modprobe.d.xml | 1 +
tools/depmod.c | 1 +
- 6 files changed, 13 insertions(+), 3 deletions(-)
+ 7 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 0e4877074f40..e7313fa8a33e 100644
+index ac47ea625e71..a03846d02b9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-I$(top_srcdir) \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-+ -DPREFIX=\""$(prefix)"\" \
++ -DDISTCONFDIR=\""$(distconfdir)"\" \
${zlib_CFLAGS}
AM_CFLAGS = $(OUR_CFLAGS)
+diff --git a/configure.ac b/configure.ac
+index a74d3baf0a42..18206ccdb607 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,6 +78,10 @@ AC_COMPILE_IFELSE(
+ # --with-
+ #####################################################################
+
++AC_ARG_WITH([distconfdir], AS_HELP_STRING([--with-distconfdir=DIR],
[directory to search for distribution configuration files]),
++ [], [with_distconfdir='${prefix}/lib'])
++AC_SUBST([distconfdir], [$with_distconfdir])
++
+ AC_ARG_WITH([rootlibdir],
+ AS_HELP_STRING([--with-rootlibdir=DIR], [rootfs directory to install
shared libraries]),
+ [], [with_rootlibdir=$libdir])
+@@ -303,6 +307,7 @@ AC_MSG_RESULT([
+
+ prefix: ${prefix}
+ sysconfdir: ${sysconfdir}
++ distconfdir: ${distconfdir}
+ libdir: ${libdir}
+ rootlibdir: ${rootlibdir}
+ includedir: ${includedir}
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index 7c2b889d713e..75fc8be3fadc 100644
+index 7c2b889d713e..bc05a1873edf 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -65,6 +65,7 @@ static const char *default_config_paths[] = {
SYSCONFDIR "/modprobe.d",
"/run/modprobe.d",
"/usr/local/lib/modprobe.d",
-+ PREFIX "/lib/modprobe.d",
++ DISTCONFDIR "/modprobe.d",
"/lib/modprobe.d",
NULL
};
-@@ -237,7 +238,7 @@ static char *get_kernel_release(const char *dirname)
+@@ -237,9 +238,9 @@ static char *get_kernel_release(const char *dirname)
* to load from user-defined configuration parameters such as
* alias, blacklists, commands (install, remove). If NULL
* defaults to /etc/modprobe.d, /run/modprobe.d,
- * /usr/local/lib/modprobe.d and /lib/modprobe.d. Give an empty
-+ * /usr/local/lib/modprobe.d and PREFIX/lib/modprobe.d. Give
an empty
- * vector if configuration should not be read. This array must
- * be null terminated.
+- * vector if configuration should not be read. This array must
+- * be null terminated.
++ * /usr/local/lib/modprobe.d, DISTCONFDIR/modprobe.d, and
++ * /lib/modprobe.d. Give an empty vector if configuration
should
++ * not be read. This array must be null terminated.
*
+ * Create kmod library context. This reads the kmod configuration
+ * and fills in the default values.
diff --git a/man/Makefile.am b/man/Makefile.am
-index 11514d52a190..ad07c30bbd24 100644
+index 11514d52a190..2fea8e46bf2f 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -17,9 +17,14 @@ EXTRA_DIST = $(MAN5:%.5=%.xml) $(MAN8:%.8=%.xml)
@@ -73,10 +99,10 @@
%.5 %.8: %.xml
- $(AM_V_XSLT)$(XSLT) \
-+ $(AM_V_XSLT)if [ -n '$(prefix)' ] ; then \
-+ sed -e 's|@PREFIX@|$(prefix)|g' $< ; \
++ $(AM_V_XSLT)if [ '$(distconfdir)' != '/lib' ] ; then \
++ sed -e 's|@DISTCONFDIR@|$(distconfdir)|g' $< ; \
+ else \
-+ sed -e '/@PREFIX@/d' $< ; \
++ sed -e '/@DISTCONFDIR@/d' $< ; \
+ fi | \
+ $(XSLT) \
-o $@ \
@@ -86,38 +112,38 @@
-
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl -
diff --git a/man/depmod.d.xml b/man/depmod.d.xml
-index 8d3d821cddc8..431ebca6654b 100644
+index 8d3d821cddc8..f282a39cc840 100644
--- a/man/depmod.d.xml
+++ b/man/depmod.d.xml
@@ -40,6 +40,7 @@
<refsynopsisdiv>
<para><filename>/lib/depmod.d/*.conf</filename></para>
-+ <para><filename>@PREFIX@/lib/depmod.d/*.conf</filename></para>
++ <para><filename>@DISTCONFDIR@/depmod.d/*.conf</filename></para>
<para><filename>/usr/local/lib/depmod.d/*.conf</filename></para>
<para><filename>/run/depmod.d/*.conf</filename></para>
<para><filename>/etc/depmod.d/*.conf</filename></para>
diff --git a/man/modprobe.d.xml b/man/modprobe.d.xml
-index 0ab3e9110a7e..e8a91d7668af 100644
+index 0ab3e9110a7e..2bf6537f07e6 100644
--- a/man/modprobe.d.xml
+++ b/man/modprobe.d.xml
@@ -41,6 +41,7 @@
<refsynopsisdiv>
<para><filename>/lib/modprobe.d/*.conf</filename></para>
-+ <para><filename>@PREFIX@/lib/modprobe.d/*.conf</filename></para>
++ <para><filename>@DISTCONFDIR@/modprobe.d/*.conf</filename></para>
<para><filename>/usr/local/lib/modprobe.d/*.conf</filename></para>
<para><filename>/run/modprobe.d/*.conf</filename></para>
<para><filename>/etc/modprobe.d/*.conf</filename></para>
diff --git a/tools/depmod.c b/tools/depmod.c
-index 364b7d4faa9e..a9349b20ee9c 100644
+index 553659755194..aada5ac57902 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -54,6 +54,7 @@ static const char *default_cfg_paths[] = {
SYSCONFDIR "/depmod.d",
"/run/depmod.d",
"/usr/local/lib/depmod.d",
-+ PREFIX "/lib/depmod.d",
++ DISTCONFDIR "/depmod.d",
"/lib/depmod.d",
NULL
};
++++++ usr-lib-modules.patch ++++++
++++ 802 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kmod/usr-lib-modules.patch
++++ and /work/SRC/openSUSE:Factory/.kmod.new.1467/usr-lib-modules.patch
