commit 30c9aa269892c55193dc560175c8c2f3e8fcaf70 · pyrox.dev/nixpkgs

+17 -10

pkgs/os-specific/linux/kmod/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }:

     

       1
       1
       +
       { stdenv, lib, fetchurl, autoreconfHook, xz, zlib, pkgconfig, libxslt }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         systems = [ "/run/current-system/kernel-modules" "/run/booted-system/kernel-modules" "" ];

     

       5
       5
       -
         modulesDirs = lib.concatMapStringsSep ":" (x: "${x}/lib/modules") systems;

     

       4
       4
       +
         systems = [ "current-system" "booted-system" ];

     

       5
       5
       +
         modulesDirs = lib.concatMapStringsSep ":" (x: "/run/${x}/kernel-modules/lib/modules") systems;

     

       6
       6
        
       

     

       7
       7
        
       in stdenv.mkDerivation rec {

     

       8
       8
        
         name = "kmod-${version}";

     

       9
       9
       -
         version = "23";

     

       9
       9
       +
         version = "22";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";

     

       13
       13
        
           sha256 = "0mc12sx06p8il1ym3hdmgxxb37apn9yv7xij26gddjdfkx8xa0yk";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
       -
         buildInputs = [ pkgconfig libxslt xz /* zlib */ ];

     

       16
       16
       +
         nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];

     

       17
       17
       +
         buildInputs = [ xz /* zlib */ ];

     

       17
       18
        
       

     

       18
       18
       -
         configureFlags = [ "--sysconfdir=/etc" "--with-xz" /* "--with-zlib" */ ];

     

       19
       19
       +
         configureFlags = [

     

       20
       20
       +
           "--sysconfdir=/etc"

     

       21
       21
       +
           "--with-xz"

     

       22
       22
       +
           "--with-modulesdirs=${modulesDirs}"

     

       23
       23
       +
           # "--with-zlib"

     

       24
       24
       +
         ];

     

       19
       25
        
       

     

       20
       26
        
         patches = [ ./module-dir.patch ];

     

       21
       27
        
       

     

       22
       28
        
         postInstall = ''

     

       23
       23
       -
           ln -s kmod $out/bin/lsmod

     

       24
       24
       -
           mkdir -p $out/sbin

     

       25
       25
       -
           for prog in rmmod insmod modinfo modprobe depmod; do

     

       26
       26
       -
             ln -sv $out/bin/kmod $out/sbin/$prog

     

       29
       29
       +
           for prog in rmmod insmod lsmod modinfo modprobe depmod; do

     

       30
       30
       +
             ln -sv $out/bin/kmod $out/bin/$prog

     

       27
       31
        
           done

     

       32
       32
       +
       

     

       33
       33
       +
           # Backwards compatibility

     

       34
       34
       +
           ln -s bin $out/sbin

     

       28
       35
        
         '';

     

       29
       36
        
       

     

       30
       37
        
         meta = {

+124 -27

pkgs/os-specific/linux/kmod/module-dir.patch

···

       1
       1
       -
       diff -ru -x '*~' kmod-17-orig/libkmod/libkmod.c kmod-17/libkmod/libkmod.c

     

       2
       2
       -
       --- kmod-17-orig/libkmod/libkmod.c	2014-04-01 12:40:37.161940089 +0200

     

       3
       3
       -
       +++ kmod-17/libkmod/libkmod.c	2014-04-17 13:47:15.871441987 +0200

     

       4
       4
       -
       @@ -201,7 +201,7 @@

     

       1
       1
       +
       diff --git a/Makefile.am b/Makefile.am

     

       2
       2
       +
       index d4eeb7e..5c9f603 100644

     

       3
       3
       +
       --- a/Makefile.am

     

       4
       4
       +
       +++ b/Makefile.am

     

       5
       5
       +
       @@ -19,6 +19,7 @@ AM_CPPFLAGS = \

     

       6
       6
       +
        	-include $(top_builddir)/config.h \

     

       7
       7
       +
        	-I$(top_srcdir) \

     

       8
       8
       +
        	-DSYSCONFDIR=\""$(sysconfdir)"\" \

     

       9
       9
       +
       +	-DMODULESDIRS=\""$(shell echo $(modulesdirs) | $(SED) 's|:|\\",\\"|g')"\" \

     

       10
       10
       +
        	${zlib_CFLAGS}

     

       11
       11
       +
        

     

       12
       12
       +
        AM_CFLAGS = $(OUR_CFLAGS)

     

       13
       13
       +
       diff --git a/configure.ac b/configure.ac

     

       14
       14
       +
       index 23510c8..66490cf 100644

     

       15
       15
       +
       --- a/configure.ac

     

       16
       16
       +
       +++ b/configure.ac

     

       17
       17
       +
       @@ -202,6 +202,12 @@ GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat])

     

       18
       18
       +
        ], [

     

       19
       19
       +
        AM_CONDITIONAL([ENABLE_GTK_DOC], false)])

     

       20
       20
       +
        

     

       21
       21
       +
       +AC_ARG_WITH([modulesdirs],

     

       22
       22
       +
       +	AS_HELP_STRING([--with-modulesdirs=DIRS], [Kernel modules directories, separated by :]),

     

       23
       23
       +
       +	[],

     

       24
       24
       +
       +	[with_modulesdirs=/lib/modules])

     

       25
       25
       +
       +AC_SUBST([modulesdirs], [$with_modulesdirs])

     

       26
       26
       +
       +

     

       27
       27
       +
        

     

       28
       28
       +
        #####################################################################

     

       29
       29
       +
        # Default CFLAGS and LDFLAGS

     

       30
       30
       +
       diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c

     

       31
       31
       +
       index 69fe431..d37da32 100644

     

       32
       32
       +
       --- a/libkmod/libkmod.c

     

       33
       33
       +
       +++ b/libkmod/libkmod.c

     

       34
       34
       +
       @@ -206,12 +206,15 @@ static int log_priority(const char *priority)

     

       35
       35
       +
        	return 0;

     

       36
       36
       +
        }

     

       37
       37
       +
        

     

       38
       38
       +
       -static const char *dirname_default_prefix = "/lib/modules";

     

       39
       39
       +
       +static const char *dirname_default_prefixes[] = {

     

       40
       40
       +
       +	MODULESDIRS,

     

       41
       41
       +
       +	NULL

     

       42
       42
       +
       +};

     

       43
       43
       +
        

     

       5
       44
        
        static char *get_kernel_release(const char *dirname)

     

       6
       45
        
        {

     

       7
       46
        
        	struct utsname u;

     
···

       10
       49
        
        

     

       11
       50
        
        	if (dirname != NULL)

     

       12
       51
        
        		return path_make_absolute_cwd(dirname);

     

       13
       13
       -
       @@ -209,7 +209,10 @@

     

       52
       52
       +
       @@ -219,8 +222,42 @@ static char *get_kernel_release(const char *dirname)

     

       14
       53
        
        	if (uname(&u) < 0)

     

       15
       54
        
        		return NULL;

     

       16
       55
        
        

     

       17
       56
        
       -	if (asprintf(&p, "%s/%s", dirname_default_prefix, u.release) < 0)

     

       18
       18
       -
       +	if ((dirname_prefix = getenv("MODULE_DIR")) == NULL)

     

       19
       19
       -
       +		dirname_prefix = dirname_default_prefix;

     

       57
       57
       +
       -		return NULL;

     

       58
       58
       +
       +	if ((dirname_prefix = getenv("MODULE_DIR")) != NULL) {

     

       59
       59
       +
       +		if(asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0)

     

       60
       60
       +
       +			return NULL;

     

       61
       61
       +
       +	} else {

     

       62
       62
       +
       +		size_t i;

     

       63
       63
       +
       +		char buf[PATH_MAX];

     

       64
       64
       +
       +

     

       65
       65
       +
       +		for (i = 0; dirname_default_prefixes[i] != NULL; i++) {

     

       66
       66
       +
       +			int plen;

     

       67
       67
       +
       +			struct stat dirstat;

     

       68
       68
       +
       +

     

       69
       69
       +
       +			plen = snprintf(buf, sizeof(buf), "%s/%s", dirname_default_prefixes[i], u.release);

     

       70
       70
       +
       +			if (plen < 0)

     

       71
       71
       +
       +				return NULL;

     

       72
       72
       +
       +			else if (plen >= PATH_MAX)

     

       73
       73
       +
       +				continue;

     

       74
       74
       +
       +

     

       75
       75
       +
       +			if (dirname_default_prefixes[i + 1] != NULL) {

     

       76
       76
       +
       +				if (stat(buf, &dirstat) < 0) {

     

       77
       77
       +
       +					if (errno == ENOENT)

     

       78
       78
       +
       +						continue;

     

       79
       79
       +
       +					else

     

       80
       80
       +
       +						return NULL;

     

       81
       81
       +
       +				}

     

       82
       82
       +
       +

     

       83
       83
       +
       +				if (!S_ISDIR(dirstat.st_mode))

     

       84
       84
       +
       +					continue;

     

       85
       85
       +
       +			}

     

       20
       86
        
       +

     

       21
       21
       -
       +	if (asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0)

     

       22
       22
       -
        		return NULL;

     

       87
       87
       +
       +			p = malloc(plen + 1);

     

       88
       88
       +
       +			if (p == NULL)

     

       89
       89
       +
       +				return NULL;

     

       90
       90
       +
       +			memcpy(p, buf, plen + 1);

     

       91
       91
       +
       +			break;

     

       92
       92
       +
       +		}

     

       93
       93
       +
       +	}

     

       23
       94
        
        

     

       24
       95
        
        	return p;

     

       25
       25
       -
       diff -ru -x '*~' kmod-17-orig/tools/static-nodes.c kmod-17/tools/static-nodes.c

     

       26
       26
       -
       --- kmod-17-orig/tools/static-nodes.c	2013-12-17 22:05:42.159047316 +0100

     

       27
       27
       -
       +++ kmod-17/tools/static-nodes.c	2014-04-17 13:51:17.945974320 +0200

     

       28
       28
       -
       @@ -159,6 +159,7 @@

     

       96
       96
       +
        }

     

       97
       97
       +
       diff --git a/tools/static-nodes.c b/tools/static-nodes.c

     

       98
       98
       +
       index 8d2356d..2ed306d 100644

     

       99
       99
       +
       --- a/tools/static-nodes.c

     

       100
       100
       +
       +++ b/tools/static-nodes.c

     

       101
       101
       +
       @@ -29,10 +29,11 @@

     

       102
       102
       +
        #include <unistd.h>

     

       103
       103
       +
        #include <sys/stat.h>

     

       104
       104
       +
        #include <sys/types.h>

     

       105
       105
       +
       -#include <sys/utsname.h>

     

       106
       106
       +
        

     

       107
       107
       +
        #include <shared/util.h>

     

       108
       108
       +
        

     

       109
       109
       +
       +#include <libkmod/libkmod.h>

     

       110
       110
       +
       +

     

       111
       111
       +
        #include "kmod.h"

     

       112
       112
       +
        

     

       113
       113
       +
        struct static_nodes_format {

     

       114
       114
       +
       @@ -154,8 +155,8 @@ static void help(void)

     

       115
       115
       +
        

     

       116
       116
       +
        static int do_static_nodes(int argc, char *argv[])

     

       117
       117
       +
        {

     

       118
       118
       +
       -	struct utsname kernel;

     

       119
       119
       +
        	char modules[PATH_MAX], buf[4096];

     

       120
       120
       +
       +	struct kmod_ctx *ctx;

     

       121
       121
       +
        	const char *output = "/dev/stdout";

     

       29
       122
        
        	FILE *in = NULL, *out = NULL;

     

       30
       123
        
        	const struct static_nodes_format *format = &static_nodes_format_human;

     

       31
       31
       -
        	int r, ret = EXIT_SUCCESS;

     

       32
       32
       -
       +	char *dirname_prefix;

     

       124
       124
       +
       @@ -206,22 +207,25 @@ static int do_static_nodes(int argc, char *argv[])

     

       125
       125
       +
        		}

     

       126
       126
       +
        	}

     

       33
       127
        
        

     

       34
       34
       -
        	for (;;) {

     

       35
       35
       -
        		int c, idx = 0, valid;

     

       36
       36
       -
       @@ -211,16 +212,19 @@

     

       128
       128
       +
       -	if (uname(&kernel) < 0) {

     

       129
       129
       +
       -		fputs("Error: uname failed!\n", stderr);

     

       130
       130
       +
       +	ctx = kmod_new(NULL, NULL);

     

       131
       131
       +
       +	if (ctx == NULL) {

     

       132
       132
       +
       +		fprintf(stderr, "Error: failed to create kmod context\n");

     

       133
       133
       +
        		ret = EXIT_FAILURE;

     

       37
       134
        
        		goto finish;

     

       38
       135
        
        	}

     

       39
       39
       -
        

     

       136
       136
       +
       -

     

       40
       137
        
       -	snprintf(modules, sizeof(modules), "/lib/modules/%s/modules.devname", kernel.release);

     

       41
       41
       -
       +	if ((dirname_prefix = getenv("MODULE_DIR")) == NULL)

     

       42
       42
       -
       +		dirname_prefix = "/lib/modules";

     

       43
       43
       -
       +

     

       44
       44
       -
       +	snprintf(modules, sizeof(modules), "%s/%s/modules.devname", dirname_prefix, kernel.release);

     

       138
       138
       +
       +	if (snprintf(modules, sizeof(modules), "%s/modules.devname", kmod_get_dirname(ctx)) < 0) {

     

       139
       139
       +
       +		fprintf(stderr, "Error: path to modules.devname is too long\n");

     

       140
       140
       +
       +		ret = EXIT_FAILURE;

     

       141
       141
       +
       +		goto finish;

     

       142
       142
       +
       +	}

     

       143
       143
       +
       +	kmod_unref(ctx);

     

       45
       144
        
        	in = fopen(modules, "re");

     

       46
       145
        
        	if (in == NULL) {

     

       47
       146
        
        		if (errno == ENOENT) {

     

       48
       147
        
       -			fprintf(stderr, "Warning: /lib/modules/%s/modules.devname not found - ignoring\n",

     

       49
       148
        
       -				kernel.release);

     

       50
       50
       -
       +			fprintf(stderr, "Warning: %s/%s/modules.devname not found - ignoring\n",

     

       51
       51
       -
       +				dirname_prefix, kernel.release);

     

       149
       149
       +
       +			fprintf(stderr, "Warning: %s not found - ignoring\n", modules);

     

       52
       150
        
        			ret = EXIT_SUCCESS;

     

       53
       151
        
        		} else {

     

       54
       152
        
       -			fprintf(stderr, "Error: could not open /lib/modules/%s/modules.devname - %m\n",

     

       55
       153
        
       -				kernel.release);

     

       56
       56
       -
       +			fprintf(stderr, "Error: could not open %s/%s/modules.devname - %m\n",

     

       57
       57
       -
       +				dirname_prefix, kernel.release);

     

       154
       154
       +
       +			fprintf(stderr, "Error: could not open %s - %m\n", modules);

     

       58
       155
        
        			ret = EXIT_FAILURE;

     

       59
       156
        
        		}

     

       60
       157
        
        		goto finish;