diff options
| author | Peter Simons <simons@cryp.to> | 2011-10-06 09:37:22 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-10-06 09:37:22 +0000 |
| commit | 1abdc56a124b0c55f6929f5ab663a32f65e1c6e2 (patch) | |
| tree | cb32e33942cc5898a4896d463fb3ff33b1c61fc8 /pkgs/build-support/kernel | |
| parent | f74e361e453e8d96dda1ffc4323ad7fe5cd93f7b (diff) | |
| parent | dce7ac1f10ea1b94fb82ed3bbb14635f5f430b6e (diff) | |
| download | nixpkgs-1abdc56a124b0c55f6929f5ab663a32f65e1c6e2.tar nixpkgs-1abdc56a124b0c55f6929f5ab663a32f65e1c6e2.tar.gz nixpkgs-1abdc56a124b0c55f6929f5ab663a32f65e1c6e2.tar.bz2 nixpkgs-1abdc56a124b0c55f6929f5ab663a32f65e1c6e2.tar.lz nixpkgs-1abdc56a124b0c55f6929f5ab663a32f65e1c6e2.tar.xz nixpkgs-1abdc56a124b0c55f6929f5ab663a32f65e1c6e2.tar.zst nixpkgs-1abdc56a124b0c55f6929f5ab663a32f65e1c6e2.zip | |
Synchronized stdenv-updates branch with trunk.
There were conflicting patches of pkgs/os-specific/linux/module-init-tools. Apparently, the expression was updated independently in both branches. I've resolved the conflict by preferring the patches from stdenv-updates, because those patches appeared to be more sophisticated, i.e. they build the manual, etc. svn path=/nixpkgs/branches/stdenv-updates/; revision=29680
Diffstat (limited to 'pkgs/build-support/kernel')
| -rw-r--r-- | pkgs/build-support/kernel/modules-closure.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index a1e790a9c72..8b244043676 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -18,7 +18,10 @@ for module in $rootModules; do | sed 's/^insmod //') \ || if test -z "$allowMissing"; then exit 1; fi #for i in $deps; do echo $i; done - closure="$closure $deps" + if [[ "$deps" != builtin* ]] + then + closure="$closure $deps" + fi done echo "closure:" |