diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-03-24 19:38:18 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-03-24 19:38:18 +0000 |
| commit | 4eaf33cc7acab524ee399296b71792db0b0c6223 (patch) | |
| tree | 333345f9bef3dfb27584b66d7ada0bd8edb498bd /pkgs/build-support/kernel | |
| parent | 71d50c6b251ad11746d4d5d234c86f12e4e2636a (diff) | |
| download | nixpkgs-4eaf33cc7acab524ee399296b71792db0b0c6223.tar nixpkgs-4eaf33cc7acab524ee399296b71792db0b0c6223.tar.gz nixpkgs-4eaf33cc7acab524ee399296b71792db0b0c6223.tar.bz2 nixpkgs-4eaf33cc7acab524ee399296b71792db0b0c6223.tar.lz nixpkgs-4eaf33cc7acab524ee399296b71792db0b0c6223.tar.xz nixpkgs-4eaf33cc7acab524ee399296b71792db0b0c6223.tar.zst nixpkgs-4eaf33cc7acab524ee399296b71792db0b0c6223.zip | |
Allow to skip non-existent modules. For custom kernels.
svn path=/nixpkgs/trunk/; revision=11273
Diffstat (limited to 'pkgs/build-support/kernel')
| -rw-r--r-- | pkgs/build-support/kernel/modules-closure.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/kernel/modules-closure.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix index 86015a8b182..55377859b24 100644 --- a/pkgs/build-support/kernel/modules-closure.nix +++ b/pkgs/build-support/kernel/modules-closure.nix @@ -3,11 +3,12 @@ # the modules identified by `rootModules', plus their dependencies. # Also generate an appropriate modules.dep. -{stdenv, kernel, rootModules, module_init_tools}: +{stdenv, kernel, rootModules, module_init_tools, allowMissing ? false}: stdenv.mkDerivation { name = kernel.name + "-shrunk"; builder = ./modules-closure.sh; inherit kernel rootModules module_init_tools; allowedReferences = ["out"]; + allowMissing = if allowMissing then "true" else ""; } diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index d16ff46ecb9..44e816c4208 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -15,7 +15,7 @@ closure= for module in $rootModules; do echo "root module: $module" deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \ - | sed 's/^insmod //') + | sed 's/^insmod //') || if test -z "allowMissing"; then exit 1; fi #for i in $deps; do echo $i; done closure="$closure $deps" done |