Author: shlevy
Date: Wed Apr 4 19:24:07 2012
New Revision: 33578
URL: https://nixos.org/websvn/nix/?rev=33578&sc=1
Log:
kmod: respect MODULE_DIR
Added:
nixpkgs/trunk/pkgs/os-specific/linux/kmod/module-dir.patch
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/kmod/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kmod/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kmod/default.nix Wed Apr 4
18:39:27 2012 (r33577)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kmod/default.nix Wed Apr 4
19:24:07 2012 (r33578)
@@ -12,6 +12,8 @@
configureFlags = [ "--with-xz" "--with-zlib" ];
+ patches = [ ./module-dir.patch ];
+
meta = {
homepage = http://www.kernel.org/pub/linux/utils/kernel/kmod/;
description = "Tools for loading and managing Linux kernel modules";
Added: nixpkgs/trunk/pkgs/os-specific/linux/kmod/module-dir.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kmod/module-dir.patch Wed Apr 4
19:24:07 2012 (r33578)
@@ -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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
