nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-16 17:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Doh! Since r15200, modules-closure.sh generated an empty set of

Browse Source 
modules for the initial ramdisk if there were no additional kernel
  module packages (such as the NVIDIA driver or AUFS), leading to a
  kernel panic in the initrd.  This was because in that case modprobe
  would print paths referring to the kernel path rather than the
  module aggregation path, and then `sed "s^$kernel^$out^"' would
  silently fail.  Fixed.

* Also, use depmod here rather than doing sed hackery on modules.dep.

* Also, `allowMissing' was broken (missing "$" before the variable
  name).

svn path=/nixpkgs/trunk/; revision=15394
This commit is contained in:
Eelco Dolstra 2009-04-29 14:32:04 +00:00
parent 7d07afc2fa
commit 16da00e64d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/kernel/modules-closure.nix
View File

@ -8,7 +8,6 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = kernel.name + "-shrunk"; name = kernel.name + "-shrunk";
builder = ./modules-closure.sh; builder = ./modules-closure.sh;
inherit kernel rootModules module_init_tools; inherit kernel rootModules module_init_tools allowMissing;
allowedReferences = ["out"]; allowedReferences = ["out"];
allowMissing = if allowMissing then "true" else "";
} }

13
pkgs/build-support/kernel/modules-closure.sh
View File

@ -8,14 +8,15 @@ version=$(cd $kernel/lib/modules && ls -d *)
echo "kernel version is $version" echo "kernel version is $version"
export MODULE_DIR=$kernel/lib/modules/ export MODULE_DIR=$(readlink -f $kernel/lib/modules/)
# Determine the dependencies of each root module. # Determine the dependencies of each root module.
closure= closure=
for module in $rootModules; do for module in $rootModules; do
echo "root module: $module" echo "root module: $module"
deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \ deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \
| sed 's/^insmod //') || if test -z "allowMissing"; then exit 1; fi | sed 's/^insmod //') \
|| if test -z "$allowMissing"; then exit 1; fi
#for i in $deps; do echo $i; done #for i in $deps; do echo $i; done
closure="$closure $deps" closure="$closure $deps"
done done
@ -23,14 +24,12 @@ done
echo "closure:" echo "closure:"
ensureDir $out ensureDir $out
for module in $closure; do for module in $closure; do
target=$(echo $module | sed "s^$kernel^$out^") target=$(echo $module | sed "s^/nix/store/.*/lib/modules/^$out/lib/modules/^")
if test -e "$target"; then continue; fi if test -e "$target"; then continue; fi
echo $module
mkdir -p $(dirname $target) mkdir -p $(dirname $target)
echo $module
cp $module $target cp $module $target
grep "^$module" $kernel/lib/modules/$version/modules.dep \
| sed "s^$kernel^$out^g" \
>> $out/lib/modules/$version/modules.dep
echo $target >> $out/insmod-list echo $target >> $out/insmod-list
done done
MODULE_DIR=$out/lib/modules/ depmod -a $version