summaryrefslogtreecommitdiff
path: root/core/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
diff options
context:
space:
mode:
Diffstat (limited to 'core/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch')
-rw-r--r--core/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch93
1 files changed, 0 insertions, 93 deletions
diff --git a/core/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/core/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
deleted file mode 100644
index 8916689f7..000000000
--- a/core/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sat, 31 Mar 2012 12:17:39 +0200
-Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules
-
-This means that we can move the configuration paths from /lib
-to /usr/lib without having to touch the kernel and related
-packages.
-
-That can be dealt with separately at a later location, in which case
-all we have to do is revert this patch.
-
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- libkmod/libkmod.c | 2 +-
- tools/depmod.c | 2 +-
- tools/modinfo.c | 4 ++--
- tools/modprobe.c | 4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index 12c1112..11edfa0 100644
---- a/libkmod/libkmod.c
-+++ b/libkmod/libkmod.c
-@@ -196,7 +196,7 @@ static int log_priority(const char *priority)
- return 0;
- }
-
--static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules";
-+static const char *dirname_default_prefix = "/lib/modules";
-
- static char *get_kernel_release(const char *dirname)
- {
-diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
-index 7bb1c5d..454d538 100644
---- a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[])
- }
-
- cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
-- "%s" ROOTPREFIX "/lib/modules/%s",
-+ "%s/lib/modules/%s",
- root == NULL ? "" : root, cfg.kversion);
-
- if (optind == argc)
-diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
-index aa5223f..b13cd4b 100644
---- a/tools/modinfo.c
-+++ b/tools/modinfo.c
-@@ -339,7 +339,7 @@ static void help(const char *progname)
- "\t-0, --null Use \\0 instead of \\n\n"
- "\t-F, --field=FIELD Print only provided FIELD\n"
- "\t-k, --set-version=VERSION Use VERSION instead of `uname -r`\n"
-- "\t-b, --basedir=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
-+ "\t-b, --basedir=DIR Use DIR as filesystem root for /lib/modules\n"
- "\t-V, --version Show version\n"
- "\t-h, --help Show this help\n",
- progname);
-@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[])
- }
- kversion = u.release;
- }
-- snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s",
-+ snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s",
- root, kversion);
- dirname = dirname_buf;
- }
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 4760682..ccb41d8 100644
---- a/tools/modprobe.c
-+++ b/tools/modprobe.c
-@@ -128,7 +128,7 @@ static void help(const char *progname)
- "\t-n, --show Same as --dry-run\n"
-
- "\t-C, --config=FILE Use FILE instead of default search paths\n"
-- "\t-d, --dirname=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
-+ "\t-d, --dirname=DIR Use DIR as filesystem root for /lib/modules\n"
- "\t-S, --set-version=VERSION Use VERSION instead of `uname -r`\n"
-
- "\t-s, --syslog print to syslog, not stderr\n"
-@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv)
- kversion = u.release;
- }
- snprintf(dirname_buf, sizeof(dirname_buf),
-- "%s" ROOTPREFIX "/lib/modules/%s", root,
-+ "%s/lib/modules/%s", root,
- kversion);
- dirname = dirname_buf;
- }
---
-1.7.9.5
-