tools: Do not link dynamically with libkmod

Instead of linking dynamically with libkmod, use libkmod-private.la. We
disallow creating a static libkmod because we can't hide symbols there
and it cause problems with external programs. However this should not
prevent users that are only interested in the tools we provide not being
able to ship only them keeping the library alone.

Other projects also do this to allow our tools to use certain functions
that should not be used outside of the project.

diff --git a/Makefile.am b/Makefile.am
index c1658685fba4069436f3da4b722a31ab8d40f40d..6cff0443ac7f435633b3a3288ccf34b8d5c9f7bc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,8 +104,8 @@ uninstall-hook:
 if BUILD_TOOLS
 bin_PROGRAMS = tools/kmod
 
-noinst_SCRIPTS = tools/test/insmod tools/test/rmmod tools/test/lsmod \
-                tools/test/modprobe tools/test/modinfo tools/test/depmod
+noinst_SCRIPTS = tools/insmod tools/rmmod tools/lsmod \
+                tools/modprobe tools/modinfo tools/depmod
 
 tools_kmod_SOURCES = tools/kmod.c tools/kmod.h tools/lsmod.c \
                     tools/rmmod.c tools/insmod.c \
@@ -113,14 +113,9 @@ tools_kmod_SOURCES = tools/kmod.c tools/kmod.h tools/lsmod.c \
                     tools/depmod.c tools/log.h tools/log.c \
                     tools/static-nodes.c
 tools_kmod_LDADD = libkmod/libkmod-util.la \
-                  libkmod/libkmod.la
+                  libkmod/libkmod-private.la
 
-noinst_PROGRAMS = tools/test/kmod
-tools_test_kmod_SOURCES = $(tools_kmod_SOURCES)
-tools_test_kmod_LDADD = libkmod/libkmod-util.la \
-                        libkmod/libkmod-private.la
-
-${noinst_SCRIPTS}: tools/test/kmod
+${noinst_SCRIPTS}: tools/kmod
        $(AM_V_GEN) ($(RM) $@; \
                $(LN_S) $(notdir $<) $@)
 endif

diff --git a/testsuite/test-depmod.c b/testsuite/test-depmod.c
index 64eb0270abef543184948865c9a14072238d38ed..0ea89829ca3aa70a8c106de568e4bee668dae79c 100644 (file)
--- a/testsuite/test-depmod.c
+++ b/testsuite/test-depmod.c
@@ -31,7 +31,7 @@
 #define MODULES_ORDER_LIB_MODULES MODULES_ORDER_ROOTFS "/lib/modules/" MODULES_ORDER_UNAME
 static __noreturn int depmod_modules_order_for_compressed(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/test/depmod";
+       const char *progname = ABS_TOP_BUILDDIR "/tools/depmod";
        const char *const args[] = {
                progname,
                NULL,

diff --git a/testsuite/test-modinfo.c b/testsuite/test-modinfo.c
index 430e7ad6b4cd1bf0512e8f71f6c405dfe05cdf53..c5934ea79ba72312bd0582a493b0acd3d0336e77 100644 (file)
--- a/testsuite/test-modinfo.c
+++ b/testsuite/test-modinfo.c
@@ -28,7 +28,7 @@
 
 static __noreturn int modinfo_jonsmodules(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/test/modinfo";
+       const char *progname = ABS_TOP_BUILDDIR "/tools/modinfo";
        const char *const args[] = {
                progname,
                "/ext4-i686.ko", "/ext4-ppc64.ko", "/ext4-s390x.ko",

diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c
index e4a324300a7a39fbe79bb05f04a1a55ed83d4d3b..cc90dae8b10d2cb7efe0e67a02aaa0833c0b6488 100644 (file)
--- a/testsuite/test-modprobe.c
+++ b/testsuite/test-modprobe.c
@@ -28,7 +28,7 @@
 
 static __noreturn int modprobe_show_depends(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/test/modprobe";
+       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
                "--show-depends", "btusb",
@@ -50,7 +50,7 @@ static DEFINE_TEST(modprobe_show_depends,
 
 static __noreturn int modprobe_show_depends2(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/test/modprobe";
+       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
                "--show-depends", "psmouse",
@@ -73,7 +73,7 @@ static DEFINE_TEST(modprobe_show_depends2,
 
 static __noreturn int modprobe_show_alias_to_none(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/test/modprobe";
+       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
                "--show-depends", "--ignore-install", "--quiet", "psmouse",
@@ -96,7 +96,7 @@ static DEFINE_TEST(modprobe_show_alias_to_none,
 
 static __noreturn int modprobe_builtin(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/test/modprobe";
+       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
                "unix",
@@ -115,7 +115,7 @@ static DEFINE_TEST(modprobe_builtin,
 
 static __noreturn int modprobe_softdep_loop(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/test/modprobe";
+       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
                "bluetooth",
@@ -135,7 +135,7 @@ static DEFINE_TEST(modprobe_softdep_loop,
 
 static __noreturn int modprobe_install_cmd_loop(const struct test *t)
 {
-       const char *progname = ABS_TOP_BUILDDIR "/tools/test/modprobe";
+       const char *progname = ABS_TOP_BUILDDIR "/tools/modprobe";
        const char *const args[] = {
                progname,
                "snd-pcm",
@@ -153,7 +153,7 @@ static DEFINE_TEST(modprobe_install_cmd_loop,
                [TC_INIT_MODULE_RETCODES] = "",
        },
        .env_vars = (const struct keyval[]) {
-               { "MODPROBE", ABS_TOP_BUILDDIR "/tools/test/modprobe" },
+               { "MODPROBE", ABS_TOP_BUILDDIR "/tools/modprobe" },
                { }
                },
        );