diff --git a/configure-Detect-openssl-sm3-support.patch b/configure-Detect-openssl-sm3-support.patch index eff7781..19b1f60 100644 --- a/configure-Detect-openssl-sm3-support.patch +++ b/configure-Detect-openssl-sm3-support.patch @@ -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 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 @@ automatically. Signed-off-by: Michal Suchanek --- - configure.ac | 7 +++++++ + configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) -Index: kmod-31/configure.ac -=================================================================== ---- kmod-31.orig/configure.ac -+++ kmod-31/configure.ac -@@ -140,6 +140,13 @@ AS_IF([test "x$with_openssl" != "xno"], +diff --git a/configure.ac b/configure.ac +index 82a853289a83..e5bceeaa1722 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -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 + int nid = NID_sm3;]])], [ + AC_MSG_NOTICE([openssl supports sm3]) @@ -30,3 +30,6 @@ Index: kmod-31/configure.ac ], [ AC_MSG_NOTICE([openssl support not requested]) ]) +-- +2.42.0 + diff --git a/kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch b/kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch index ef125d4..bb2c081 100644 --- a/kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch +++ b/kmod-Add-pkgconfig-file-with-kmod-compile-time-confi.patch @@ -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 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,29 @@ v2: mention module signature in commit message v3: add sysconfdir v5: add distconfdir, switch to pkgconfig --- - Makefile.am | 4 +++- - configure.ac | 11 +++++++++++ - tools/kmod.pc.in | 9 +++++++++ - 3 files changed, 23 insertions(+), 1 deletion(-) + Makefile.am | 2 +- + configure.ac | 11 +++++++++++ + tools/kmod.pc.in | 9 +++++++++ + 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 tools/kmod.pc.in -Index: kmod-31/Makefile.am -=================================================================== ---- kmod-31.orig/Makefile.am -+++ kmod-31/Makefile.am -@@ -98,7 +98,9 @@ libkmod_libkmod_internal_la_DEPENDENCIES +diff --git a/Makefile.am b/Makefile.am +index e6630a36e18c..2a54c25bd631 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -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 +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 = \ -Index: kmod-31/configure.ac -=================================================================== ---- kmod-31.orig/configure.ac -+++ kmod-31/configure.ac +diff --git a/configure.ac b/configure.ac +index fd88d1fbdbf7..7bf8d78ca747 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])]) @@ -73,15 +71,15 @@ Index: kmod-31/configure.ac ], [ AC_MSG_NOTICE([zlib support not requested]) ]) -@@ -127,6 +133,7 @@ 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.]) +@@ -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]) ]) -@@ -291,6 +298,9 @@ AC_DEFINE_UNQUOTED(KMOD_FEATURES, ["$wit +@@ -298,6 +305,9 @@ AC_DEFINE_UNQUOTED(KMOD_FEATURES, ["$with_features"], [Features in this build]) # Generate files from *.in ##################################################################### @@ -91,7 +89,7 @@ Index: kmod-31/configure.ac AC_CONFIG_FILES([ Makefile man/Makefile -@@ -298,6 +308,7 @@ AC_CONFIG_FILES([ +@@ -305,6 +315,7 @@ AC_CONFIG_FILES([ libkmod/docs/version.xml libkmod/libkmod.pc libkmod/python/kmod/version.py @@ -99,10 +97,11 @@ Index: kmod-31/configure.ac ]) -Index: kmod-31/tools/kmod.pc.in -=================================================================== +diff --git a/tools/kmod.pc.in b/tools/kmod.pc.in +new file mode 100644 +index 000000000000..2595980a6b35 --- /dev/null -+++ kmod-31/tools/kmod.pc.in ++++ b/tools/kmod.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +sysconfdir=@sysconfdir@ @@ -113,3 +112,6 @@ Index: kmod-31/tools/kmod.pc.in +Name: kmod +Description: Tools to deal with kernel modules +Version: @VERSION@ +-- +2.42.0 + diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec index 8ee2523..070049f 100644 --- a/kmod-testsuite.spec +++ b/kmod-testsuite.spec @@ -40,12 +40,12 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch 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: configure-Detect-openssl-sm3-support.patch Patch8: man-depmod.d-Fix-incorrect-usr-lib-search-path.patch Patch9: usr-lib-modprobe.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 diff --git a/kmod.changes b/kmod.changes index 187e12d..1ae218c 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 17 15:34:57 UTC 2023 - Michal Suchanek + +- 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 diff --git a/kmod.spec b/kmod.spec index d87b3bd..847a2a9 100644 --- a/kmod.spec +++ b/kmod.spec @@ -41,12 +41,12 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch 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: configure-Detect-openssl-sm3-support.patch Patch8: man-depmod.d-Fix-incorrect-usr-lib-search-path.patch Patch9: usr-lib-modprobe.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 diff --git a/usr-lib-modules.patch b/usr-lib-modules.patch index 4289b2c..c86191e 100644 --- a/usr-lib-modules.patch +++ b/usr-lib-modules.patch @@ -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 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,31 +16,32 @@ move kernel modules to /usr while others can keep them in /lib. Signed-off-by: Michal Suchanek --- v4: Make the whole path configurable +v5: More verbose commit message --- - Makefile.am | 3 - configure.ac | 7 ++ - libkmod/libkmod.c | 4 - - man/Makefile.am | 1 - man/depmod.d.xml | 6 - - man/depmod.xml | 4 - - man/modinfo.xml | 2 - man/modprobe.xml | 2 - man/modules.dep.xml | 6 - - testsuite/module-playground/Makefile | 2 - testsuite/setup-rootfs.sh | 110 +++++++++++++++++++---------------- - testsuite/test-depmod.c | 16 ++--- - testsuite/test-testsuite.c | 8 +- - tools/depmod.c | 6 - - tools/kmod.pc.in | 1 - tools/modinfo.c | 4 - - tools/modprobe.c | 4 - - tools/static-nodes.c | 6 - - 18 files changed, 108 insertions(+), 84 deletions(-) + Makefile.am | 3 +- + configure.ac | 7 ++ + libkmod/libkmod.c | 4 +- + man/Makefile.am | 1 + + man/depmod.d.xml | 6 +- + man/depmod.xml | 4 +- + man/modinfo.xml | 2 +- + man/modprobe.xml | 2 +- + man/modules.dep.xml | 6 +- + testsuite/module-playground/Makefile | 2 +- + testsuite/setup-rootfs.sh | 109 +++++++++++++++------------ + testsuite/test-depmod.c | 16 ++-- + testsuite/test-testsuite.c | 8 +- + tools/depmod.c | 6 +- + tools/kmod.pc.in | 1 + + tools/modinfo.c | 4 +- + tools/modprobe.c | 4 +- + tools/static-nodes.c | 6 +- + 18 files changed, 107 insertions(+), 84 deletions(-) -Index: kmod-31/Makefile.am -=================================================================== ---- kmod-31.orig/Makefile.am -+++ kmod-31/Makefile.am +diff --git a/Makefile.am b/Makefile.am +index 2a54c25bd631..4062d81227df 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -20,6 +20,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ @@ -46,7 +50,7 @@ Index: kmod-31/Makefile.am ${zlib_CFLAGS} AM_CFLAGS = $(OUR_CFLAGS) -@@ -224,7 +225,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 @@ -55,10 +59,10 @@ Index: kmod-31/Makefile.am build-module-playground: $(AM_V_GEN)if test "$(top_srcdir)" != "$(top_builddir)"; then \ -Index: kmod-31/configure.ac -=================================================================== ---- kmod-31.orig/configure.ac -+++ kmod-31/configure.ac +diff --git a/configure.ac b/configure.ac +index 7bf8d78ca747..d282fef9a08c 100644 +--- a/configure.ac ++++ b/configure.ac @@ -91,6 +91,12 @@ AC_ARG_WITH([rootlibdir], [], [with_rootlibdir=$libdir]) AC_SUBST([rootlibdir], [$with_rootlibdir]) @@ -72,7 +76,7 @@ Index: kmod-31/configure.ac AC_ARG_WITH([zstd], AS_HELP_STRING([--with-zstd], [handle Zstandard-compressed modules @<:@default=disabled@:>@]), [], [with_zstd=no]) -@@ -319,6 +325,7 @@ AC_MSG_RESULT([ +@@ -326,6 +332,7 @@ AC_MSG_RESULT([ $PACKAGE $VERSION ======= @@ -80,11 +84,11 @@ Index: kmod-31/configure.ac prefix: ${prefix} sysconfdir: ${sysconfdir} distconfdir: ${distconfdir} -Index: kmod-31/libkmod/libkmod.c -=================================================================== ---- kmod-31.orig/libkmod/libkmod.c -+++ kmod-31/libkmod/libkmod.c -@@ -210,7 +210,7 @@ static int log_priority(const char *prio +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 57fac1cb9f7b..4489cbd04bf7 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -210,7 +210,7 @@ static int log_priority(const char *priority) return 0; } @@ -93,7 +97,7 @@ Index: kmod-31/libkmod/libkmod.c static char *get_kernel_release(const char *dirname) { -@@ -266,7 +266,7 @@ static enum kmod_file_compression_type g +@@ -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 @@ -102,10 +106,10 @@ Index: kmod-31/libkmod/libkmod.c * it's treated as relative to the current working directory. * Otherwise, give an absolute dirname. * @config_paths: ordered array of paths (directories or files) where -Index: kmod-31/man/Makefile.am -=================================================================== ---- kmod-31.orig/man/Makefile.am -+++ kmod-31/man/Makefile.am +diff --git a/man/Makefile.am b/man/Makefile.am +index 2fea8e46bf2f..f550091a216a 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am @@ -22,6 +22,7 @@ CLEANFILES = $(dist_man_MANS) else \ sed -e '/@DISTCONFDIR@/d' $< ; \ @@ -114,10 +118,10 @@ Index: kmod-31/man/Makefile.am $(XSLT) \ -o $@ \ --nonet \ -Index: kmod-31/man/depmod.d.xml -=================================================================== ---- kmod-31.orig/man/depmod.d.xml -+++ kmod-31/man/depmod.d.xml +diff --git a/man/depmod.d.xml b/man/depmod.d.xml +index f282a39cc840..b07e6a2bd4fe 100644 +--- a/man/depmod.d.xml ++++ b/man/depmod.d.xml @@ -70,7 +70,7 @@ @@ -145,10 +149,10 @@ Index: kmod-31/man/depmod.d.xml over any likenamed module already provided by the kernel. -Index: kmod-31/man/depmod.xml -=================================================================== ---- kmod-31.orig/man/depmod.xml -+++ kmod-31/man/depmod.xml +diff --git a/man/depmod.xml b/man/depmod.xml +index 3b0097184fd7..fce2a4a67a89 100644 +--- a/man/depmod.xml ++++ b/man/depmod.xml @@ -80,7 +80,7 @@ depmod creates a list of module dependencies by @@ -167,10 +171,10 @@ Index: kmod-31/man/depmod.xml but in a staging area, you can specify a basedir which is prepended to the directory name. This basedir is -Index: kmod-31/man/modinfo.xml -=================================================================== ---- kmod-31.orig/man/modinfo.xml -+++ kmod-31/man/modinfo.xml +diff --git a/man/modinfo.xml b/man/modinfo.xml +index 9fe0324a2527..b6c4d6045829 100644 +--- a/man/modinfo.xml ++++ b/man/modinfo.xml @@ -54,7 +54,7 @@ modinfo extracts information from the Linux Kernel modules given on the command line. If the module name is not a filename, @@ -180,10 +184,10 @@ Index: kmod-31/man/modinfo.xml directory is searched, as is also done by modprobe8 when loading kernel modules. -Index: kmod-31/man/modprobe.xml -=================================================================== ---- kmod-31.orig/man/modprobe.xml -+++ kmod-31/man/modprobe.xml +diff --git a/man/modprobe.xml b/man/modprobe.xml +index 91f9e27997cd..4d1fd59c000b 100644 +--- a/man/modprobe.xml ++++ b/man/modprobe.xml @@ -78,7 +78,7 @@ is no difference between _ and - in module names (automatic underscore conversion is performed). @@ -193,10 +197,10 @@ Index: kmod-31/man/modprobe.xml the modules and other files, except for the optional configuration files in the /etc/modprobe.d directory -Index: kmod-31/man/modules.dep.xml -=================================================================== ---- kmod-31.orig/man/modules.dep.xml -+++ kmod-31/man/modules.dep.xml +diff --git a/man/modules.dep.xml b/man/modules.dep.xml +index ed633694ec9e..8ef6d8b3536e 100644 +--- a/man/modules.dep.xml ++++ b/man/modules.dep.xml @@ -34,8 +34,8 @@ @@ -217,10 +221,10 @@ Index: kmod-31/man/modules.dep.xml It is used by kmod tools such as modprobe and libkmod. -Index: kmod-31/testsuite/module-playground/Makefile -=================================================================== ---- kmod-31.orig/testsuite/module-playground/Makefile -+++ kmod-31/testsuite/module-playground/Makefile +diff --git a/testsuite/module-playground/Makefile b/testsuite/module-playground/Makefile +index e6045b0dd932..a7ab09bea2bf 100644 +--- a/testsuite/module-playground/Makefile ++++ b/testsuite/module-playground/Makefile @@ -47,7 +47,7 @@ endif else @@ -230,10 +234,10 @@ Index: kmod-31/testsuite/module-playground/Makefile KVER ?= `uname -r` ifeq ($(FAKE_BUILD),) FAKE_BUILD=0 -Index: kmod-31/testsuite/setup-rootfs.sh -=================================================================== ---- kmod-31.orig/testsuite/setup-rootfs.sh -+++ kmod-31/testsuite/setup-rootfs.sh +diff --git a/testsuite/setup-rootfs.sh b/testsuite/setup-rootfs.sh +index 4440ddcd6b4d..a780f9381b3c 100755 +--- a/testsuite/setup-rootfs.sh ++++ b/testsuite/setup-rootfs.sh @@ -16,6 +16,19 @@ create_rootfs() { cp -r "$ROOTFS_PRISTINE" "$ROOTFS" find "$ROOTFS" -type d -exec chmod +w {} \; @@ -254,7 +258,7 @@ Index: kmod-31/testsuite/setup-rootfs.sh if [ "$SYSCONFDIR" != "/etc" ]; then find "$ROOTFS" -type d -name etc -printf "%h\n" | while read -r e; do -@@ -32,57 +45,58 @@ feature_enabled() { +@@ -32,57 +45,57 @@ feature_enabled() { declare -A map map=( @@ -275,28 +279,28 @@ Index: kmod-31/testsuite/setup-rootfs.sh - ["test-depmod/detect-loop/lib/modules/4.4.4/kernel/mod-loop-k.ko"]="mod-loop-k.ko" - ["test-depmod/search-order-external-first/lib/modules/4.4.4/foo/"]="mod-simple.ko" - ["test-depmod/search-order-external-first/lib/modules/4.4.4/foobar/"]="mod-simple.ko" -+ ["test-depmod/search-order-simple/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/crypto/"]="mod-simple.ko" -+ ["test-depmod/search-order-simple/lib/modules$MODULE_DIRECTORY/4.4.4/updates/"]="mod-simple.ko" -+ ["test-depmod/search-order-same-prefix/lib/modules$MODULE_DIRECTORY/4.4.4/foo/"]="mod-simple.ko" -+ ["test-depmod/search-order-same-prefix/lib/modules$MODULE_DIRECTORY/4.4.4/foobar/"]="mod-simple.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-c.ko"]="mod-loop-c.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-d.ko"]="mod-loop-d.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-e.ko"]="mod-loop-e.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-f.ko"]="mod-loop-f.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-g.ko"]="mod-loop-g.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-h.ko"]="mod-loop-h.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-i.ko"]="mod-loop-i.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-j.ko"]="mod-loop-j.ko" -+ ["test-depmod/detect-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-k.ko"]="mod-loop-k.ko" -+ ["test-depmod/search-order-external-first/lib/modules$MODULE_DIRECTORY/4.4.4/foo/"]="mod-simple.ko" -+ ["test-depmod/search-order-external-first/lib/modules$MODULE_DIRECTORY/4.4.4/foobar/"]="mod-simple.ko" ++ ["test-depmod/search-order-simple$MODULE_DIRECTORY/4.4.4/kernel/crypto/"]="mod-simple.ko" ++ ["test-depmod/search-order-simple$MODULE_DIRECTORY/4.4.4/updates/"]="mod-simple.ko" ++ ["test-depmod/search-order-same-prefix$MODULE_DIRECTORY/4.4.4/foo/"]="mod-simple.ko" ++ ["test-depmod/search-order-same-prefix$MODULE_DIRECTORY/4.4.4/foobar/"]="mod-simple.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-c.ko"]="mod-loop-c.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-d.ko"]="mod-loop-d.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-e.ko"]="mod-loop-e.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-f.ko"]="mod-loop-f.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-g.ko"]="mod-loop-g.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-h.ko"]="mod-loop-h.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-i.ko"]="mod-loop-i.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-j.ko"]="mod-loop-j.ko" ++ ["test-depmod/detect-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-k.ko"]="mod-loop-k.ko" ++ ["test-depmod/search-order-external-first$MODULE_DIRECTORY/4.4.4/foo/"]="mod-simple.ko" ++ ["test-depmod/search-order-external-first$MODULE_DIRECTORY/4.4.4/foobar/"]="mod-simple.ko" ["test-depmod/search-order-external-first/lib/modules/external/"]="mod-simple.ko" - ["test-depmod/search-order-external-last/lib/modules/4.4.4/foo/"]="mod-simple.ko" - ["test-depmod/search-order-external-last/lib/modules/4.4.4/foobar/"]="mod-simple.ko" -+ ["test-depmod/search-order-external-last/lib/modules$MODULE_DIRECTORY/4.4.4/foo/"]="mod-simple.ko" -+ ["test-depmod/search-order-external-last/lib/modules$MODULE_DIRECTORY/4.4.4/foobar/"]="mod-simple.ko" ++ ["test-depmod/search-order-external-last$MODULE_DIRECTORY/4.4.4/foo/"]="mod-simple.ko" ++ ["test-depmod/search-order-external-last$MODULE_DIRECTORY/4.4.4/foobar/"]="mod-simple.ko" ["test-depmod/search-order-external-last/lib/modules/external/"]="mod-simple.ko" - ["test-depmod/search-order-override/lib/modules/4.4.4/foo/"]="mod-simple.ko" - ["test-depmod/search-order-override/lib/modules/4.4.4/override/"]="mod-simple.ko" @@ -304,20 +308,20 @@ Index: kmod-31/testsuite/setup-rootfs.sh - ["test-dependencies/lib/modules/4.0.20-kmod/kernel/"]="mod-foo-c.ko" - ["test-dependencies/lib/modules/4.0.20-kmod/kernel/lib/"]="mod-foo-a.ko" - ["test-dependencies/lib/modules/4.0.20-kmod/kernel/fs/"]="mod-foo.ko" -+ ["test-depmod/search-order-override/lib/modules$MODULE_DIRECTORY/4.4.4/foo/"]="mod-simple.ko" -+ ["test-depmod/search-order-override/lib/modules$MODULE_DIRECTORY/4.4.4/override/"]="mod-simple.ko" -+ ["test-dependencies/lib/modules$MODULE_DIRECTORY/4.0.20-kmod/kernel/fs/foo/"]="mod-foo-b.ko" -+ ["test-dependencies/lib/modules$MODULE_DIRECTORY/4.0.20-kmod/kernel/"]="mod-foo-c.ko" -+ ["test-dependencies/lib/modules$MODULE_DIRECTORY/4.0.20-kmod/kernel/lib/"]="mod-foo-a.ko" -+ ["test-dependencies/lib/modules$MODULE_DIRECTORY/4.0.20-kmod/kernel/fs/"]="mod-foo.ko" ++ ["test-depmod/search-order-override$MODULE_DIRECTORY/4.4.4/foo/"]="mod-simple.ko" ++ ["test-depmod/search-order-override$MODULE_DIRECTORY/4.4.4/override/"]="mod-simple.ko" ++ ["test-dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/fs/foo/"]="mod-foo-b.ko" ++ ["test-dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/"]="mod-foo-c.ko" ++ ["test-dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/lib/"]="mod-foo-a.ko" ++ ["test-dependencies$MODULE_DIRECTORY/4.0.20-kmod/kernel/fs/"]="mod-foo.ko" ["test-init/"]="mod-simple.ko" ["test-remove/"]="mod-simple.ko" - ["test-modprobe/show-depends/lib/modules/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" - ["test-modprobe/show-depends/lib/modules/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" - ["test-modprobe/show-depends/lib/modules/4.4.4/kernel/mod-simple.ko"]="mod-simple.ko" -+ ["test-modprobe/show-depends/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" -+ ["test-modprobe/show-depends/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" -+ ["test-modprobe/show-depends/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-simple.ko"]="mod-simple.ko" ++ ["test-modprobe/show-depends$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" ++ ["test-modprobe/show-depends$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" ++ ["test-modprobe/show-depends$MODULE_DIRECTORY/4.4.4/kernel/mod-simple.ko"]="mod-simple.ko" ["test-modprobe/show-exports/mod-loop-a.ko"]="mod-loop-a.ko" - ["test-modprobe/softdep-loop/lib/modules/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" - ["test-modprobe/softdep-loop/lib/modules/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" @@ -328,16 +332,15 @@ Index: kmod-31/testsuite/setup-rootfs.sh - ["test-modprobe/oldkernel-force/lib/modules/3.3.3/kernel/"]="mod-simple.ko" - ["test-modprobe/alias-to-none/lib/modules/4.4.4/kernel/"]="mod-simple.ko" - ["test-modprobe/module-param-kcmdline/lib/modules/4.4.4/kernel/"]="mod-simple.ko" -+ ["test-modprobe/softdep-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" -+ ["test-modprobe/softdep-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" -+ ["test-modprobe/install-cmd-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" -+ ["test-modprobe/install-cmd-loop/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" -+ ["test-modprobe/force/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko" -+ ["test-modprobe/oldkernel/lib/modules$MODULE_DIRECTORY/3.3.3/kernel/"]="mod-simple.ko" -+ ["test-modprobe/oldkernel-force/lib/modules$MODULE_DIRECTORY/3 -+ .3.3/kernel/"]="mod-simple.ko" -+ ["test-modprobe/alias-to-none/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko" -+ ["test-modprobe/module-param-kcmdline/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko" ++ ["test-modprobe/softdep-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" ++ ["test-modprobe/softdep-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" ++ ["test-modprobe/install-cmd-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-a.ko"]="mod-loop-a.ko" ++ ["test-modprobe/install-cmd-loop$MODULE_DIRECTORY/4.4.4/kernel/mod-loop-b.ko"]="mod-loop-b.ko" ++ ["test-modprobe/force$MODULE_DIRECTORY/4.4.4/kernel/"]="mod-simple.ko" ++ ["test-modprobe/oldkernel$MODULE_DIRECTORY/3.3.3/kernel/"]="mod-simple.ko" ++ ["test-modprobe/oldkernel-force$MODULE_DIRECTORY/3.3.3/kernel/"]="mod-simple.ko" ++ ["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" @@ -347,16 +350,16 @@ Index: kmod-31/testsuite/setup-rootfs.sh - ["test-depmod/modules-outdir/lib/modules/4.4.4/kernel/drivers/block/cciss.ko"]="mod-fake-cciss.ko" - ["test-depmod/modules-outdir/lib/modules/4.4.4/kernel/drivers/scsi/hpsa.ko"]="mod-fake-hpsa.ko" - ["test-depmod/modules-outdir/lib/modules/4.4.4/kernel/drivers/scsi/scsi_mod.ko"]="mod-fake-scsi-mod.ko" -+ ["test-depmod/modules-order-compressed/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/drivers/block/cciss.ko"]="mod-fake-cciss.ko" -+ ["test-depmod/modules-order-compressed/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/drivers/scsi/hpsa.ko"]="mod-fake-hpsa.ko" -+ ["test-depmod/modules-order-compressed/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/drivers/scsi/scsi_mod.ko"]="mod-fake-scsi-mod.ko" -+ ["test-depmod/modules-outdir/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/drivers/block/cciss.ko"]="mod-fake-cciss.ko" -+ ["test-depmod/modules-outdir/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/drivers/scsi/hpsa.ko"]="mod-fake-hpsa.ko" -+ ["test-depmod/modules-outdir/lib/modules$MODULE_DIRECTORY/4.4.4/kernel/drivers/scsi/scsi_mod.ko"]="mod-fake-scsi-mod.ko" ++ ["test-depmod/modules-order-compressed$MODULE_DIRECTORY/4.4.4/kernel/drivers/block/cciss.ko"]="mod-fake-cciss.ko" ++ ["test-depmod/modules-order-compressed$MODULE_DIRECTORY/4.4.4/kernel/drivers/scsi/hpsa.ko"]="mod-fake-hpsa.ko" ++ ["test-depmod/modules-order-compressed$MODULE_DIRECTORY/4.4.4/kernel/drivers/scsi/scsi_mod.ko"]="mod-fake-scsi-mod.ko" ++ ["test-depmod/modules-outdir$MODULE_DIRECTORY/4.4.4/kernel/drivers/block/cciss.ko"]="mod-fake-cciss.ko" ++ ["test-depmod/modules-outdir$MODULE_DIRECTORY/4.4.4/kernel/drivers/scsi/hpsa.ko"]="mod-fake-hpsa.ko" ++ ["test-depmod/modules-outdir$MODULE_DIRECTORY/4.4.4/kernel/drivers/scsi/scsi_mod.ko"]="mod-fake-scsi-mod.ko" ["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" -@@ -90,20 +104,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" @@ -382,10 +385,10 @@ Index: kmod-31/testsuite/setup-rootfs.sh ) attach_sha256_array=( -Index: kmod-31/testsuite/test-depmod.c -=================================================================== ---- kmod-31.orig/testsuite/test-depmod.c -+++ kmod-31/testsuite/test-depmod.c +diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c +index 93606947f18a..c96dbf0a62be 100644 +--- a/testsuite/test-depmod.c ++++ b/testsuite/test-depmod.c @@ -27,7 +27,7 @@ #define MODULES_UNAME "4.4.4" @@ -395,7 +398,7 @@ Index: kmod-31/testsuite/test-depmod.c static noreturn int depmod_modules_order_for_compressed(const struct test *t) { const char *progname = ABS_TOP_BUILDDIR "/tools/depmod"; -@@ -55,8 +55,8 @@ DEFINE_TEST(depmod_modules_order_for_com +@@ -55,8 +55,8 @@ DEFINE_TEST(depmod_modules_order_for_compressed, }); #define MODULES_OUTDIR_ROOTFS TESTSUITE_ROOTFS "test-depmod/modules-outdir" @@ -433,7 +436,7 @@ Index: kmod-31/testsuite/test-depmod.c static noreturn int depmod_search_order_external_first(const struct test *t) { const char *progname = ABS_TOP_BUILDDIR "/tools/depmod"; -@@ -191,7 +191,7 @@ DEFINE_TEST(depmod_search_order_external +@@ -191,7 +191,7 @@ DEFINE_TEST(depmod_search_order_external_first, }); #define SEARCH_ORDER_EXTERNAL_LAST_ROOTFS TESTSUITE_ROOTFS "test-depmod/search-order-external-last" @@ -442,7 +445,7 @@ Index: kmod-31/testsuite/test-depmod.c static noreturn int depmod_search_order_external_last(const struct test *t) { const char *progname = ABS_TOP_BUILDDIR "/tools/depmod"; -@@ -218,7 +218,7 @@ DEFINE_TEST(depmod_search_order_external +@@ -218,7 +218,7 @@ DEFINE_TEST(depmod_search_order_external_last, }); #define SEARCH_ORDER_OVERRIDE_ROOTFS TESTSUITE_ROOTFS "test-depmod/search-order-override" @@ -451,11 +454,11 @@ Index: kmod-31/testsuite/test-depmod.c static noreturn int depmod_search_order_override(const struct test *t) { const char *progname = ABS_TOP_BUILDDIR "/tools/depmod"; -Index: kmod-31/testsuite/test-testsuite.c -=================================================================== ---- kmod-31.orig/testsuite/test-testsuite.c -+++ kmod-31/testsuite/test-testsuite.c -@@ -64,7 +64,7 @@ static int testsuite_rootfs_fopen(const +diff --git a/testsuite/test-testsuite.c b/testsuite/test-testsuite.c +index 56e73609f204..c77c4bbc04eb 100644 +--- a/testsuite/test-testsuite.c ++++ b/testsuite/test-testsuite.c +@@ -64,7 +64,7 @@ static int testsuite_rootfs_fopen(const struct test *t) char s[100]; int n; @@ -464,7 +467,7 @@ Index: kmod-31/testsuite/test-testsuite.c if (fp == NULL) return EXIT_FAILURE;; -@@ -89,7 +89,7 @@ static int testsuite_rootfs_open(const s +@@ -89,7 +89,7 @@ static int testsuite_rootfs_open(const struct test *t) char buf[100]; int fd, done; @@ -473,7 +476,7 @@ Index: kmod-31/testsuite/test-testsuite.c if (fd < 0) return EXIT_FAILURE; -@@ -121,12 +121,12 @@ static int testsuite_rootfs_stat_access( +@@ -121,12 +121,12 @@ static int testsuite_rootfs_stat_access(const struct test *t) { struct stat st; @@ -488,10 +491,10 @@ Index: kmod-31/testsuite/test-testsuite.c ERR("stat failed: %m\n"); return EXIT_FAILURE; } -Index: kmod-31/tools/depmod.c -=================================================================== ---- kmod-31.orig/tools/depmod.c -+++ kmod-31/tools/depmod.c +diff --git a/tools/depmod.c b/tools/depmod.c +index 630fef9c8fb0..7f7c4b74d216 100644 +--- a/tools/depmod.c ++++ b/tools/depmod.c @@ -911,7 +911,7 @@ struct vertex; struct mod { struct kmod_module *kmod; @@ -501,7 +504,7 @@ Index: kmod-31/tools/depmod.c char *uncrelpath; /* same as relpath but ending in .ko */ struct kmod_list *info_list; struct kmod_list *dep_sym_list; -@@ -3024,11 +3024,11 @@ static int do_depmod(int argc, char *arg +@@ -3024,11 +3024,11 @@ static int do_depmod(int argc, char *argv[]) } cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, @@ -515,10 +518,10 @@ Index: kmod-31/tools/depmod.c out_root ?: (root ?: ""), cfg.kversion); if (optind == argc) -Index: kmod-31/tools/kmod.pc.in -=================================================================== ---- kmod-31.orig/tools/kmod.pc.in -+++ kmod-31/tools/kmod.pc.in +diff --git a/tools/kmod.pc.in b/tools/kmod.pc.in +index 2595980a6b35..97215c8ed48f 100644 +--- a/tools/kmod.pc.in ++++ b/tools/kmod.pc.in @@ -1,6 +1,7 @@ prefix=@prefix@ sysconfdir=@sysconfdir@ @@ -527,10 +530,10 @@ Index: kmod-31/tools/kmod.pc.in module_compressions=@module_compressions@ module_signatures=@module_signatures@ -Index: kmod-31/tools/modinfo.c -=================================================================== ---- kmod-31.orig/tools/modinfo.c -+++ kmod-31/tools/modinfo.c +diff --git a/tools/modinfo.c b/tools/modinfo.c +index d0aab200af4e..cacc32dc4c40 100644 +--- a/tools/modinfo.c ++++ b/tools/modinfo.c @@ -367,7 +367,7 @@ static void help(void) "\t-m, --modname Handle argument as module name instead of alias or filename\n" "\t-F, --field=FIELD Print only provided FIELD\n" @@ -540,7 +543,7 @@ Index: kmod-31/tools/modinfo.c "\t-V, --version Show version\n" "\t-h, --help Show this help\n", program_invocation_short_name); -@@ -462,7 +462,7 @@ static int do_modinfo(int argc, char *ar +@@ -462,7 +462,7 @@ static int do_modinfo(int argc, char *argv[]) } kversion = u.release; } @@ -549,11 +552,11 @@ Index: kmod-31/tools/modinfo.c root, kversion); dirname = dirname_buf; } -Index: kmod-31/tools/modprobe.c -=================================================================== ---- kmod-31.orig/tools/modprobe.c -+++ kmod-31/tools/modprobe.c -@@ -146,7 +146,7 @@ static void help(void) +diff --git a/tools/modprobe.c b/tools/modprobe.c +index e891028349a8..5306bef250da 100644 +--- a/tools/modprobe.c ++++ b/tools/modprobe.c +@@ -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" @@ -562,7 +565,7 @@ Index: kmod-31/tools/modprobe.c "\t-S, --set-version=VERSION Use VERSION instead of `uname -r`\n" "\t-s, --syslog print to syslog, not stderr\n" -@@ -1012,7 +1012,7 @@ static int do_modprobe(int argc, char ** +@@ -999,7 +999,7 @@ static int do_modprobe(int argc, char **orig_argv) kversion = u.release; } snprintf(dirname_buf, sizeof(dirname_buf), @@ -571,11 +574,11 @@ Index: kmod-31/tools/modprobe.c kversion); dirname = dirname_buf; } -Index: kmod-31/tools/static-nodes.c -=================================================================== ---- kmod-31.orig/tools/static-nodes.c -+++ kmod-31/tools/static-nodes.c -@@ -212,15 +212,15 @@ static int do_static_nodes(int argc, cha +diff --git a/tools/static-nodes.c b/tools/static-nodes.c +index 8d2356da73f3..5ef3743e967b 100644 +--- a/tools/static-nodes.c ++++ b/tools/static-nodes.c +@@ -212,15 +212,15 @@ static int do_static_nodes(int argc, char *argv[]) goto finish; } @@ -594,3 +597,6 @@ Index: kmod-31/tools/static-nodes.c kernel.release); ret = EXIT_FAILURE; } +-- +2.42.0 +