public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kmod: respect MODULE_DIR 

svn path=/nixpkgs/trunk/; revision=33578
This commit is contained in:
Shea Levy 2012-04-04 19:24:07 +00:00
parent 1c62133e9f
commit 4d0fdc5e6b
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kmod/default.nix
View File

@ -12,6 +12,8 @@ stdenv.mkDerivation {
configureFlags = [ "--with-xz" "--with-zlib" ]; configureFlags = [ "--with-xz" "--with-zlib" ];
patches = [ ./module-dir.patch ];
meta = { meta = {
homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/; homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/;
description = "Tools for loading and managing Linux kernel modules"; description = "Tools for loading and managing Linux kernel modules";

24
pkgs/os-specific/linux/kmod/module-dir.patch Normal file
View File

@ -0,0 +1,24 @@
diff -Naur kmod-7-orig/libkmod/libkmod.c kmod-7/libkmod/libkmod.c
--- kmod-7-orig/libkmod/libkmod.c 2012-03-15 08:19:16.750010226 -0400
+++ kmod-7/libkmod/libkmod.c 2012-04-04 15:21:29.532074313 -0400
@@ -200,7 +200,7 @@
static char *get_kernel_release(const char *dirname)
{
struct utsname u;
- char *p;
+ char *p, *dirname_prefix;
if (dirname != NULL)
return path_make_absolute_cwd(dirname);
@@ -208,7 +208,10 @@
if (uname(&u) < 0)
return NULL;
- if (asprintf(&p, "%s/%s", dirname_default_prefix, u.release) < 0)
+ if ((dirname_prefix = getenv("MODULE_DIR")) == NULL)
+ dirname_prefix = dirname_default_prefix;
+
+ if (asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0)
return NULL;
return p;