diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-08-30 06:26:12 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-08-30 06:55:52 +0200 |
commit | f19c961b4e461da045f2e72e73701059e5117be0 (patch) | |
tree | 1d1b4accbba99222ae9d47a03da0d920ee5477b7 /pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch | |
parent | e7b2f05d209b8d07263a6b3891f1eae1cc12944a (diff) | |
download | nixlib-f19c961b4e461da045f2e72e73701059e5117be0.tar nixlib-f19c961b4e461da045f2e72e73701059e5117be0.tar.gz nixlib-f19c961b4e461da045f2e72e73701059e5117be0.tar.bz2 nixlib-f19c961b4e461da045f2e72e73701059e5117be0.tar.lz nixlib-f19c961b4e461da045f2e72e73701059e5117be0.tar.xz nixlib-f19c961b4e461da045f2e72e73701059e5117be0.tar.zst nixlib-f19c961b4e461da045f2e72e73701059e5117be0.zip |
linux-testing: Fix arg list too long in modinst
With the default kernel and thus with the build I have tested in 74ec94bfa2e57e2c0beeee0e469de58391d04a7b, we get an error during modules_install: make[2]: execvp: /nix/store/.../bin/bash: Argument list too long I haven't noticed this build until I actually tried booting using this kernel because make didn't fail here. The reason this happens within Nix and probably didn't yet surface in other distros is that programs only have a limited amount of memory available for storing the environment and the arguments. Environment variables however are quite common on Nix and thus we stumble on problems like this way earlier - in this case Linux 4.8 - but I have noticed this in 4.7-next as well already. The fix is far from perfect and suffers performance overhead because we now run grep for every *.mod file instead of passing all *.mod files into one single invocation of grep. But comparing the performance overhead (around 1s on my machine) with the overall build time of the kernel I think the overhead really is neglicible. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch')
-rw-r--r-- | pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch b/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch new file mode 100644 index 000000000000..58a9191989ae --- /dev/null +++ b/pkgs/os-specific/linux/kernel/modinst-arg-list-too-long.patch @@ -0,0 +1,14 @@ +diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst +index 07650ee..934a7a8 100644 +--- a/scripts/Makefile.modinst ++++ b/scripts/Makefile.modinst +@@ -9,7 +9,8 @@ include scripts/Kbuild.include + + # + +-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod))) ++__modules := $(sort $(foreach f,$(wildcard $(MODVERDIR)/*.mod),$(shell \ ++ grep -h '\.ko$$' '$f'))) + modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) + + PHONY += $(modules) |