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-10-18 21:25:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
and /work/SRC/openSUSE:Factory/.kmod.new.31755 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmod"
Wed Oct 18 21:25:12 2023 rev:79 rq:1118391 version:31
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2023-08-15
16:39:11.770655580 +0200
+++ /work/SRC/openSUSE:Factory/.kmod.new.31755/kmod.changes 2023-10-18
21:25:14.267674756 +0200
@@ -1,0 +2,24 @@
+Tue Oct 17 15:34:57 UTC 2023 - Michal Suchanek <msucha...@suse.de>
+
+- Fix tests
+ * refresh configure-Detect-openssl-sm3-support.patch
+ * refresh kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch
+ * refresh usr-lib-modules.patch
+
+-------------------------------------------------------------------
+Fri Sep 29 16:38:01 UTC 2023 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 31
+ * Allow passing a path to modprobe so the module is loaded from
+ anywhere from the filesystem.
+ * Use in-kernel decompression if available.
+ * depmod learned a `-o <dir>` option to allow using a separate
+ output directory.
+- Delete depmod-Introduce-outdir-option.patch,
+ testsuite-Handle-different-sysconfdir.patch,
+ testsuite-depmod-use-defines-for-the-rootfs-lib_modu.patch,
+ 0001-testsuite-repair-read-of-uninitialized-memory.patch,
+ testsuite-Move-setup-rootfs-logic-from-Makefile-to-s.patch
+
+
+-------------------------------------------------------------------
Old:
----
0001-testsuite-repair-read-of-uninitialized-memory.patch
depmod-Introduce-outdir-option.patch
kmod-30.tar.sign
kmod-30.tar.xz
testsuite-Handle-different-sysconfdir.patch
testsuite-Move-setup-rootfs-logic-from-Makefile-to-s.patch
testsuite-depmod-use-defines-for-the-rootfs-lib_modu.patch
New:
----
kmod-31.tar.sign
kmod-31.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmod-testsuite.spec ++++++
--- /var/tmp/diff_new_pack.wyBfUg/_old 2023-10-18 21:25:15.127705910 +0200
+++ /var/tmp/diff_new_pack.wyBfUg/_new 2023-10-18 21:25:15.127705910 +0200
@@ -22,7 +22,7 @@
Name: kmod-testsuite
%define lname libkmod2
-Version: 30
+Version: 31
Release: 0
Summary: Testsuite of the kmod package
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -40,17 +40,12 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch
-Patch7: 0001-testsuite-repair-read-of-uninitialized-memory.patch
+Patch7: configure-Detect-openssl-sm3-support.patch
Patch8: man-depmod.d-Fix-incorrect-usr-lib-search-path.patch
Patch9: usr-lib-modprobe.patch
-Patch10: testsuite-Move-setup-rootfs-logic-from-Makefile-to-s.patch
-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-pkgconfig-file-with-kmod-compile-time-confi.patch
Patch15: usr-lib-modules.patch
Patch16: no-stylesheet-download.patch
-Patch17: configure-Detect-openssl-sm3-support.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
++++++ kmod.spec ++++++
--- /var/tmp/diff_new_pack.wyBfUg/_old 2023-10-18 21:25:15.155706924 +0200
+++ /var/tmp/diff_new_pack.wyBfUg/_new 2023-10-18 21:25:15.155706924 +0200
@@ -22,7 +22,7 @@
Name: kmod
%define lname libkmod2
-Version: 30
+Version: 31
Release: 0
Summary: Utilities to load modules into the kernel
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -41,17 +41,12 @@
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch
-Patch7: 0001-testsuite-repair-read-of-uninitialized-memory.patch
+Patch7: configure-Detect-openssl-sm3-support.patch
Patch8: man-depmod.d-Fix-incorrect-usr-lib-search-path.patch
Patch9: usr-lib-modprobe.patch
-Patch10: testsuite-Move-setup-rootfs-logic-from-Makefile-to-s.patch
-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-pkgconfig-file-with-kmod-compile-time-confi.patch
Patch15: usr-lib-modules.patch
Patch16: no-stylesheet-download.patch
-Patch17: configure-Detect-openssl-sm3-support.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
++++++ 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch ++++++
--- /var/tmp/diff_new_pack.wyBfUg/_old 2023-10-18 21:25:15.183707938 +0200
+++ /var/tmp/diff_new_pack.wyBfUg/_new 2023-10-18 21:25:15.187708083 +0200
@@ -7,16 +7,16 @@
References: fate#316971
Patch-mainline: never
---
- libkmod/libkmod-config.c | 12 ++++++++++--
- libkmod/libkmod-internal.h | 1 +
- libkmod/libkmod-module.c | 31 +++++++++++++++++++++++++++++++
+ libkmod/libkmod-config.c | 12 ++++++++++--
+ libkmod/libkmod-internal.h | 1 +
+ libkmod/libkmod-module.c | 31 +++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+), 2 deletions(-)
-diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
-index 1b24536..07d6a9e 100644
---- a/libkmod/libkmod-config.c
-+++ b/libkmod/libkmod-config.c
-@@ -651,8 +651,16 @@ static int kmod_config_parse(struct kmod_config *config,
int fd,
+Index: kmod-31/libkmod/libkmod-config.c
+===================================================================
+--- kmod-31.orig/libkmod/libkmod-config.c
++++ kmod-31/libkmod/libkmod-config.c
+@@ -708,8 +708,16 @@ static int kmod_config_parse(struct kmod
ERR(ctx, "%s: command %s is deprecated and not parsed
anymore\n",
filename, cmd);
} else if (streq(cmd, "allow_unsupported_modules")) {
@@ -35,11 +35,11 @@
} else {
syntax_error:
ERR(ctx, "%s line %u: ignoring bad line starting with
'%s'\n",
-diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
-index a65ddd1..2ad74c7 100644
---- a/libkmod/libkmod-internal.h
-+++ b/libkmod/libkmod-internal.h
-@@ -119,6 +119,7 @@ struct kmod_config {
+Index: kmod-31/libkmod/libkmod-internal.h
+===================================================================
+--- kmod-31.orig/libkmod/libkmod-internal.h
++++ kmod-31/libkmod/libkmod-internal.h
+@@ -130,6 +130,7 @@ struct kmod_config {
struct kmod_list *softdeps;
struct kmod_list *paths;
@@ -47,13 +47,13 @@
};
int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **config, const
char * const *config_paths) __attribute__((nonnull(1, 2,3)));
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index bffe715..9a3a35a 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -798,6 +798,24 @@ KMOD_EXPORT int kmod_module_remove_module(struct
kmod_module *mod,
-
- extern long init_module(const void *mem, unsigned long len, const char *args);
+Index: kmod-31/libkmod/libkmod-module.c
+===================================================================
+--- kmod-31.orig/libkmod/libkmod-module.c
++++ kmod-31/libkmod/libkmod-module.c
+@@ -781,6 +781,24 @@ KMOD_EXPORT const char *kmod_module_get_
+ return mod->name;
+ }
+static int check_module_supported(struct kmod_module *mod)
+{
@@ -74,17 +74,17 @@
+}
+
/**
- * kmod_module_insert_module:
+ * kmod_module_get_path:
* @mod: kmod module
-@@ -823,6 +841,7 @@ KMOD_EXPORT int kmod_module_insert_module(struct
kmod_module *mod,
- struct kmod_elf *elf;
+@@ -959,6 +977,7 @@ KMOD_EXPORT int kmod_module_insert_modul
+ int err;
const char *path;
const char *args = options ? options : "";
+ const struct kmod_config *config = kmod_get_config(mod->ctx);
if (mod == NULL)
return -ENOENT;
-@@ -841,6 +860,18 @@ KMOD_EXPORT int kmod_module_insert_module(struct
kmod_module *mod,
+@@ -977,6 +996,18 @@ KMOD_EXPORT int kmod_module_insert_modul
}
}
@@ -100,10 +100,7 @@
+ }
+ }
+
- if (kmod_file_get_direct(mod->file)) {
- unsigned int kernel_flags = 0;
-
---
-2.20.1
-
+ err = do_finit_module(mod, flags, args);
+ if (err == -ENOSYS)
+ err = do_init_module(mod, flags, args);
++++++ configure-Detect-openssl-sm3-support.patch ++++++
--- /var/tmp/diff_new_pack.wyBfUg/_old 2023-10-18 21:25:15.231709677 +0200
+++ /var/tmp/diff_new_pack.wyBfUg/_new 2023-10-18 21:25:15.235709822 +0200
@@ -1,7 +1,7 @@
-From 90446ff0273775ee20762bb892fd3e901c8eb8ac Mon Sep 17 00:00:00 2001
+From 1bb5f3aafc9b4bff638ed3288308289fdec60270 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
+Subject: [PATCH 1/6] 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
@@ -9,17 +9,17 @@
Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
+ configure.ac | 7 +++++++
+ 1 file changed, 7 insertions(+)
diff --git a/configure.ac b/configure.ac
-index a1e64e190d2f..5a582cb5a2af 100644
+index 82a853289a83..e5bceeaa1722 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])
+@@ -123,6 +123,13 @@ AC_ARG_WITH([openssl],
+ AS_IF([test "x$with_openssl" != "xno"], [
+ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.1.0], [LIBS="$LIBS
$libcrypto_LIBS"])
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])
@@ -31,6 +31,6 @@
AC_MSG_NOTICE([openssl support not requested])
])
--
-2.41.0
+2.42.0
++++++ kmod-30.tar.xz -> kmod-31.tar.xz ++++++
++++ 3623 lines of diff (skipped)
++++++ kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch ++++++
--- /var/tmp/diff_new_pack.wyBfUg/_old 2023-10-18 21:25:15.647724747 +0200
+++ /var/tmp/diff_new_pack.wyBfUg/_new 2023-10-18 21:25:15.651724892 +0200
@@ -1,7 +1,7 @@
-From 2e4eff4f252fe2a4c5bdb81e3ca2639b9b5f04c6 Mon Sep 17 00:00:00 2001
+From 6760cce5b59eeb2ba9b96f43626221df0128a285 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
+Subject: [PATCH 4/6] kmod: Add pkgconfig file with kmod compile time
configuration
Show distconfdir (where system configuration files are searched/to be
@@ -14,31 +14,27 @@
v3: add sysconfdir
v5: add distconfdir, switch to pkgconfig
---
- Makefile.am | 6 +++---
+ Makefile.am | 2 +-
configure.ac | 11 +++++++++++
tools/kmod.pc.in | 9 +++++++++
- 3 files changed, 23 insertions(+), 3 deletions(-)
+ 3 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 tools/kmod.pc.in
diff --git a/Makefile.am b/Makefile.am
-index a03846d02b9c..18818c811634 100644
+index e6630a36e18c..2a54c25bd631 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -118,9 +118,9 @@ libkmod_libkmod_internal_la_DEPENDENCIES =
$(libkmod_libkmod_la_DEPENDENCIES)
+@@ -96,7 +96,7 @@ 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
+index fd88d1fbdbf7..7bf8d78ca747 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,9 @@ LT_INIT([disable-static pic-only])
@@ -51,39 +47,39 @@
#####################################################################
# Program checks and configurations
#####################################################################
-@@ -93,6 +96,7 @@ AC_ARG_WITH([zstd],
+@@ -94,6 +97,7 @@ AC_ARG_WITH([zstd],
AS_IF([test "x$with_zstd" != "xno"], [
- PKG_CHECK_MODULES([libzstd], [libzstd >= 1.4.4])
+ PKG_CHECK_MODULES([libzstd], [libzstd >= 1.4.4], [LIBS="$LIBS
$libzstd_LIBS"])
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],
+@@ -105,6 +109,7 @@ AC_ARG_WITH([xz],
AS_IF([test "x$with_xz" != "xno"], [
- PKG_CHECK_MODULES([liblzma], [liblzma >= 4.99])
+ PKG_CHECK_MODULES([liblzma], [liblzma >= 4.99], [LIBS="$LIBS
$liblzma_LIBS"])
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],
+@@ -116,6 +121,7 @@ AC_ARG_WITH([zlib],
AS_IF([test "x$with_zlib" != "xno"], [
- PKG_CHECK_MODULES([zlib], [zlib])
+ PKG_CHECK_MODULES([zlib], [zlib], [LIBS="$LIBS $zlib_LIBS"])
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.])
+@@ -134,6 +140,7 @@ AS_IF([test "x$with_openssl" != "xno"], [
+ AC_MSG_NOTICE([openssl sm3 support not detected])
+ CPPFLAGS="$CPPFLAGS -DOPENSSL_NO_SM3"
+ ])
+ 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])
+@@ -298,6 +305,9 @@ AC_DEFINE_UNQUOTED(KMOD_FEATURES, ["$with_features"],
[Features in this build])
# Generate files from *.in
#####################################################################
@@ -93,8 +89,10 @@
AC_CONFIG_FILES([
Makefile
man/Makefile
- libkmod/docs/Makefile
+@@ -305,6 +315,7 @@ AC_CONFIG_FILES([
libkmod/docs/version.xml
+ libkmod/libkmod.pc
+ libkmod/python/kmod/version.py
+ tools/kmod.pc
])
@@ -115,6 +113,6 @@
+Description: Tools to deal with kernel modules
+Version: @VERSION@
--
-2.41.0
+2.42.0
++++++ usr-lib-modules.patch ++++++
--- /var/tmp/diff_new_pack.wyBfUg/_old 2023-10-18 21:25:15.683726052 +0200
+++ /var/tmp/diff_new_pack.wyBfUg/_new 2023-10-18 21:25:15.683726052 +0200
@@ -1,11 +1,14 @@
-From d6ca73ea19ef26506686e7cc85044c40f3fb917c Mon Sep 17 00:00:00 2001
+From 4ad85461d27d240efcb4922eb5810a65356a8d6a Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msucha...@suse.de>
Date: Fri, 26 May 2023 10:38:05 +0200
-Subject: [PATCH 4/7] libkmod, depmod, modprobe: Make directory for kernel
+Subject: [PATCH 5/6] libkmod, depmod, modprobe: Make directory for kernel
modules configurable
-modprobe.d is now searched under ${prefix}/lib, add ${module_directory} to
-specify the directory where to search for kernel modules.
+Now that modprobe.d is searched under ${prefix}/lib, allow a complete
+transition to files only under ${prefix} by adding a ${module_directory}
+configuration. This specifies the directory where to search for kernel
+modules and should match the location where the kernel/distro installs
+them.
With this distributions that do not want to ship files in /lib can also
move kernel modules to /usr while others can keep them in /lib.
@@ -13,6 +16,7 @@
Signed-off-by: Michal Suchanek <msucha...@suse.de>
---
v4: Make the whole path configurable
+v5: More verbose commit message
---
Makefile.am | 3 +-
configure.ac | 7 ++
@@ -35,7 +39,7 @@
18 files changed, 107 insertions(+), 84 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index fd4c7a04ec51..1d51a43d68ba 100644
+index 2a54c25bd631..4062d81227df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS = \
@@ -46,7 +50,7 @@
${zlib_CFLAGS}
AM_CFLAGS = $(OUR_CFLAGS)
-@@ -247,7 +248,7 @@ EXTRA_DIST += testsuite/setup-rootfs.sh
+@@ -220,7 +221,7 @@ EXTRA_DIST += testsuite/setup-rootfs.sh
MODULE_PLAYGROUND = testsuite/module-playground
ROOTFS = testsuite/rootfs
ROOTFS_PRISTINE = $(top_srcdir)/testsuite/rootfs-pristine
@@ -56,10 +60,10 @@
build-module-playground:
$(AM_V_GEN)if test "$(top_srcdir)" != "$(top_builddir)"; then \
diff --git a/configure.ac b/configure.ac
-index a6ed8a36ca70..602d3d3dbdf1 100644
+index 7bf8d78ca747..d282fef9a08c 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -90,6 +90,12 @@ AC_ARG_WITH([rootlibdir],
+@@ -91,6 +91,12 @@ AC_ARG_WITH([rootlibdir],
[], [with_rootlibdir=$libdir])
AC_SUBST([rootlibdir], [$with_rootlibdir])
@@ -72,7 +76,7 @@
AC_ARG_WITH([zstd],
AS_HELP_STRING([--with-zstd], [handle Zstandard-compressed modules
@<:@default=disabled@:>@]),
[], [with_zstd=no])
-@@ -316,6 +322,7 @@ AC_MSG_RESULT([
+@@ -326,6 +332,7 @@ AC_MSG_RESULT([
$PACKAGE $VERSION
=======
@@ -81,10 +85,10 @@
sysconfdir: ${sysconfdir}
distconfdir: ${distconfdir}
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index bc05a1873edf..876458f7449a 100644
+index 57fac1cb9f7b..4489cbd04bf7 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
-@@ -209,7 +209,7 @@ static int log_priority(const char *priority)
+@@ -210,7 +210,7 @@ static int log_priority(const char *priority)
return 0;
}
@@ -93,7 +97,7 @@
static char *get_kernel_release(const char *dirname)
{
-@@ -231,7 +231,7 @@ static char *get_kernel_release(const char *dirname)
+@@ -266,7 +266,7 @@ static enum kmod_file_compression_type
get_kernel_compression(struct kmod_ctx *c
/**
* kmod_new:
* @dirname: what to consider as linux module's directory, if NULL
@@ -181,7 +185,7 @@
<citerefentry><refentrytitle>modprobe</refentrytitle><manvolnum>8</manvolnum></citerefentry>
when loading kernel modules.
diff --git a/man/modprobe.xml b/man/modprobe.xml
-index db39c7a18bb7..7374f37a0f7b 100644
+index 91f9e27997cd..4d1fd59c000b 100644
--- a/man/modprobe.xml
+++ b/man/modprobe.xml
@@ -78,7 +78,7 @@
@@ -231,7 +235,7 @@
ifeq ($(FAKE_BUILD),)
FAKE_BUILD=0
diff --git a/testsuite/setup-rootfs.sh b/testsuite/setup-rootfs.sh
-index 8b13a40f2cae..2fc7e592d1b5 100755
+index 4440ddcd6b4d..a780f9381b3c 100755
--- a/testsuite/setup-rootfs.sh
+++ b/testsuite/setup-rootfs.sh
@@ -16,6 +16,19 @@ create_rootfs() {
@@ -254,7 +258,7 @@
if [ "$SYSCONFDIR" != "/etc" ]; then
find "$ROOTFS" -type d -name etc -printf "%h\n" | while read -r
e; do
-@@ -32,55 +45,55 @@ feature_enabled() {
+@@ -32,57 +45,57 @@ feature_enabled() {
declare -A map
map=(
@@ -338,6 +342,8 @@
+
["test-modprobe/alias-to-none$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko"
+
["test-modprobe/module-param-kcmdline$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko"
["test-modprobe/external/lib/modules/external/"]="mod-simple.ko"
+ ["test-modprobe/module-from-abspath/home/foo/"]="mod-simple.ko"
+ ["test-modprobe/module-from-relpath/home/foo/"]="mod-simple.ko"
-
["test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/block/cciss.ko"]="mod-fake-cciss.ko"
-
["test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/scsi/hpsa.ko"]="mod-fake-hpsa.ko"
-
["test-depmod/modules-order-compressed/lib/modules/4.4.4/kernel/drivers/scsi/scsi_mod.ko"]="mod-fake-scsi-mod.ko"
@@ -353,7 +359,7 @@
["test-modinfo/mod-simple-i386.ko"]="mod-simple-i386.ko"
["test-modinfo/mod-simple-x86_64.ko"]="mod-simple-x86_64.ko"
["test-modinfo/mod-simple-sparc64.ko"]="mod-simple-sparc64.ko"
-@@ -88,20 +101,20 @@ map=(
+@@ -90,20 +103,20 @@ map=(
["test-modinfo/mod-simple-sha256.ko"]="mod-simple.ko"
["test-modinfo/mod-simple-pkcs7.ko"]="mod-simple.ko"
["test-modinfo/external/lib/modules/external/mod-simple.ko"]="mod-simple.ko"
@@ -486,7 +492,7 @@
return EXIT_FAILURE;
}
diff --git a/tools/depmod.c b/tools/depmod.c
-index aada5ac57902..5ef490473186 100644
+index 630fef9c8fb0..7f7c4b74d216 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -911,7 +911,7 @@ struct vertex;
@@ -547,10 +553,10 @@
dirname = dirname_buf;
}
diff --git a/tools/modprobe.c b/tools/modprobe.c
-index 322d5d199372..c7016a58e43f 100644
+index e891028349a8..5306bef250da 100644
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
-@@ -146,7 +146,7 @@ static void help(void)
+@@ -142,7 +142,7 @@ static void help(void)
"\t-n, --show Same as --dry-run\n"
"\t-C, --config=FILE Use FILE instead of default
search paths\n"
@@ -559,7 +565,7 @@
"\t-S, --set-version=VERSION Use VERSION instead of `uname
-r`\n"
"\t-s, --syslog print to syslog, not stderr\n"
-@@ -983,7 +983,7 @@ static int do_modprobe(int argc, char **orig_argv)
+@@ -999,7 +999,7 @@ static int do_modprobe(int argc, char **orig_argv)
kversion = u.release;
}
snprintf(dirname_buf, sizeof(dirname_buf),
@@ -592,6 +598,6 @@
ret = EXIT_FAILURE;
}
--
-2.41.0
+2.42.0
