module_init_tools: Remove
It is deprecated doesn't handle compressed modules, unlike its modern counterpart kmod. Add a compatibility alias to kmod for now in case someone is depending on this in their scripts.
This commit is contained in:
Tuomas Tynkkynen
parent
d0c127487f
commit
0f8a49bb45
|
|
@ -1,38 +0,0 @@
|
|||
{ stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }:
|
||||
|
||||
assert (stdenv.lib.elem stdenv.system stdenv.lib.platforms.linux);
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "module-init-tools-3.16";
|
||||
|
||||
src = [
|
||||
(fetchurl {
|
||||
url = http://ftp.be.debian.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.16.tar.bz2;
|
||||
sha256 = "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1";
|
||||
})
|
||||
|
||||
# Upstream forgot to include the generated manpages. Thankfully
|
||||
# the Gentoo people fixed this for us :-)
|
||||
(fetchurl {
|
||||
urls = [
|
||||
mirror://gentoo/distfiles/module-init-tools-3.16-man.tar.bz2
|
||||
http://mirror.meleeweb.net/pub/linux/gentoo/distfiles/module-init-tools-3.16-man.tar.bz2
|
||||
];
|
||||
sha256 = "1j1nzi87kgsh4scl645fhwhjvljxj83cmdasa4n4p5krhasgw358";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ stdenv.glibc.dev stdenv.glibc.static ];
|
||||
|
||||
SGML_CATALOG_FILES = "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat";
|
||||
|
||||
patches = [ ./module-dir.patch ./docbook2man.patch ];
|
||||
|
||||
postInstall = "rm $out/sbin/insmod.static"; # don't need it
|
||||
|
||||
meta = {
|
||||
homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/;
|
||||
description = "Tools for loading and managing Linux kernel modules";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -Naur module-init-tools-3.16-orig/Makefile.in module-init-tools-3.16/Makefile.in
|
||||
--- module-init-tools-3.16-orig/Makefile.in 2011-06-02 13:56:45.000000000 -0400
|
||||
+++ module-init-tools-3.16/Makefile.in 2011-10-01 23:59:30.584443193 -0400
|
||||
@@ -174,7 +174,7 @@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
-DOCBOOKTOMAN = @DOCBOOKTOMAN@
|
||||
+DOCBOOKTOMAN = @DOCBOOKTOMAN@ --sgml
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
ECHO_T = @ECHO_T@
|
||||
|
|
@ -1,161 +0,0 @@
|
|||
commit cf2c95edb7918bc658f6cae93793c1949fc9cb6e
|
||||
Author: David Guibert <david.guibert@gmail.com>
|
||||
Date: Fri Aug 5 14:20:12 2011 +0200
|
||||
|
||||
introduce module-dir
|
||||
|
||||
diff --git a/depmod.c b/depmod.c
|
||||
index a1d2f8c..9362a35 100644
|
||||
--- a/depmod.c
|
||||
+++ b/depmod.c
|
||||
@@ -48,9 +48,6 @@
|
||||
|
||||
#include "testing.h"
|
||||
|
||||
-#ifndef MODULE_DIR
|
||||
-#define MODULE_DIR "/lib/modules/"
|
||||
-#endif
|
||||
|
||||
#ifndef MODULE_BUILTIN_KEY
|
||||
#define MODULE_BUILTIN_KEY "built-in"
|
||||
@@ -1516,6 +1513,7 @@ static int parse_config_file(const char *filename,
|
||||
char *line;
|
||||
unsigned int linenum = 0;
|
||||
FILE *cfile;
|
||||
+ char *module_dir;
|
||||
|
||||
cfile = fopen(filename, "r");
|
||||
if (!cfile) {
|
||||
@@ -1525,6 +1523,10 @@ static int parse_config_file(const char *filename,
|
||||
return 0;
|
||||
}
|
||||
|
||||
+ if((module_dir = getenv("MODULE_DIR")) == NULL) {
|
||||
+ module_dir = "/lib/modules/";
|
||||
+ }
|
||||
+
|
||||
while ((line = getline_wrapped(cfile, &linenum)) != NULL) {
|
||||
char *ptr = line;
|
||||
char *cmd, *modname;
|
||||
@@ -1550,7 +1552,7 @@ static int parse_config_file(const char *filename,
|
||||
continue;
|
||||
}
|
||||
nofail_asprintf(&dirname, "%s%s%s/%s", basedir,
|
||||
- MODULE_DIR, kernelversion, search_path);
|
||||
+ module_dir, kernelversion, search_path);
|
||||
len = strlen(dirname);
|
||||
*search = add_search(dirname, len, *search);
|
||||
free(dirname);
|
||||
@@ -1565,7 +1567,7 @@ static int parse_config_file(const char *filename,
|
||||
continue;
|
||||
|
||||
nofail_asprintf(&pathname, "%s%s%s/%s/%s.ko", basedir,
|
||||
- MODULE_DIR, kernelversion, subdir, modname);
|
||||
+ module_dir, kernelversion, subdir, modname);
|
||||
|
||||
*overrides = add_override(pathname, *overrides);
|
||||
free(pathname);
|
||||
@@ -1737,6 +1739,7 @@ int main(int argc, char *argv[])
|
||||
char *basedir = "", *dirname, *version;
|
||||
char *system_map = NULL, *module_symvers = NULL;
|
||||
int i;
|
||||
+ char *module_dir;
|
||||
const char *config = NULL;
|
||||
|
||||
if (native_endianness() == 0)
|
||||
@@ -1832,7 +1835,11 @@ int main(int argc, char *argv[])
|
||||
if (optind == argc)
|
||||
all = 1;
|
||||
|
||||
- nofail_asprintf(&dirname, "%s%s%s", basedir, MODULE_DIR, version);
|
||||
+ if((module_dir = getenv("MODULE_DIR")) == NULL) {
|
||||
+ module_dir = "/lib/modules/";
|
||||
+ }
|
||||
+
|
||||
+ nofail_asprintf(&dirname, "%s%s%s", basedir, module_dir, version);
|
||||
|
||||
if (maybe_all) {
|
||||
if (!doing_stdout && !depfile_out_of_date(dirname))
|
||||
@@ -1850,7 +1857,7 @@ int main(int argc, char *argv[])
|
||||
size_t len;
|
||||
|
||||
nofail_asprintf(&dirname, "%s%s%s/updates", basedir,
|
||||
- MODULE_DIR, version);
|
||||
+ module_dir, version);
|
||||
len = strlen(dirname);
|
||||
search = add_search(dirname, len, search);
|
||||
}
|
||||
diff --git a/modinfo.c b/modinfo.c
|
||||
index 1dd8469..67b1041 100644
|
||||
--- a/modinfo.c
|
||||
+++ b/modinfo.c
|
||||
@@ -19,9 +19,6 @@
|
||||
#include "zlibsupport.h"
|
||||
#include "testing.h"
|
||||
|
||||
-#ifndef MODULE_DIR
|
||||
-#define MODULE_DIR "/lib/modules"
|
||||
-#endif
|
||||
|
||||
struct param
|
||||
{
|
||||
@@ -193,6 +190,11 @@ static struct elf_file *grab_module(const char *name,
|
||||
struct utsname buf;
|
||||
char *depname, *p, *moddir;
|
||||
struct elf_file *module;
|
||||
+ char *module_dir;
|
||||
+
|
||||
+ if((module_dir = getenv("MODULE_DIR")) == NULL) {
|
||||
+ module_dir = "/lib/modules/";
|
||||
+ }
|
||||
|
||||
if (strchr(name, '.') || strchr(name, '/')) {
|
||||
module = grab_elf_file(name);
|
||||
@@ -207,9 +209,9 @@ static struct elf_file *grab_module(const char *name,
|
||||
kernel = buf.release;
|
||||
}
|
||||
if (strlen(basedir))
|
||||
- nofail_asprintf(&moddir, "%s/%s/%s", basedir, MODULE_DIR, kernel);
|
||||
+ nofail_asprintf(&moddir, "%s/%s/%s", basedir, module_dir, kernel);
|
||||
else
|
||||
- nofail_asprintf(&moddir, "%s/%s", MODULE_DIR, kernel);
|
||||
+ nofail_asprintf(&moddir, "%s/%s", module_dir, kernel);
|
||||
|
||||
/* Search for it in modules.dep. */
|
||||
nofail_asprintf(&depname, "%s/%s", moddir, "modules.dep");
|
||||
diff --git a/modprobe.c b/modprobe.c
|
||||
index 5464f45..d9fbf9d 100644
|
||||
--- a/modprobe.c
|
||||
+++ b/modprobe.c
|
||||
@@ -86,10 +86,6 @@ typedef enum
|
||||
|
||||
} modprobe_flags_t;
|
||||
|
||||
-#ifndef MODULE_DIR
|
||||
-#define MODULE_DIR "/lib/modules"
|
||||
-#endif
|
||||
-
|
||||
/**
|
||||
* print_usage - output the prefered program usage
|
||||
*
|
||||
@@ -2136,6 +2132,7 @@ int main(int argc, char *argv[])
|
||||
struct modprobe_conf conf = {};
|
||||
|
||||
recursion_depth = 0;
|
||||
+ char *module_dir = NULL;
|
||||
|
||||
/* Prepend options from environment. */
|
||||
argv = merge_args(getenv("MODPROBE_OPTIONS"), argv, &argc);
|
||||
@@ -2233,7 +2230,11 @@ int main(int argc, char *argv[])
|
||||
if (argc < optind + 1 && !dump_config && !list_only)
|
||||
print_usage(argv[0]);
|
||||
|
||||
- nofail_asprintf(&dirname, "%s%s/%s", basedir, MODULE_DIR, buf.release);
|
||||
+ if((module_dir = getenv("MODULE_DIR")) == NULL) {
|
||||
+ module_dir = "/lib/modules";
|
||||
+ }
|
||||
+
|
||||
+ nofail_asprintf(&dirname, "%s%s/%s", basedir, module_dir, buf.release);
|
||||
|
||||
/* Old-style -t xxx wildcard? Only with -l. */
|
||||
if (list_only) {
|
||||
|
|
@ -59,6 +59,7 @@ doNotDisplayTwice rec {
|
|||
manpages = man-pages; # added 2015-12-06
|
||||
midoriWrapper = midori; # added 2015-01
|
||||
mlt-qt5 = qt5.mlt; # added 2015-12-19
|
||||
module_init_tools = kmod; # added 2016-04-22
|
||||
mssys = ms-sys; # added 2015-12-13
|
||||
multipath_tools = multipath-tools; # added 2016-01-21
|
||||
mupen64plus1_5 = mupen64plus; # added 2016-02-12
|
||||
|
|
|
|||
|
|
@ -10870,8 +10870,6 @@ in
|
|||
|
||||
mmc-utils = callPackage ../os-specific/linux/mmc-utils { };
|
||||
|
||||
module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
|
||||
|
||||
aggregateModules = modules:
|
||||
callPackage ../os-specific/linux/kmod/aggregator.nix {
|
||||
inherit modules;
|
||||
|
|
|
|||
|
|
@ -105,7 +105,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
|
|||
mingetty = linux;
|
||||
mk = linux;
|
||||
mktemp = all;
|
||||
module_init_tools = linux;
|
||||
mono = linux;
|
||||
monotone = linux;
|
||||
mpg321 = linux;
|
||||
|
|
|
|||
Loading…
Reference in New Issue