From 1b89e8a55ba48ed36e99f2d68d9878a1e311e405 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Mar 2008 12:16:32 +0000 Subject: [PATCH] * Write a partial ordering of modules to $out/insmod-list (for when we don't have modprobe in the initrd). svn path=/nixos/trunk/; revision=11079 --- helpers/modules-closure.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/helpers/modules-closure.sh b/helpers/modules-closure.sh index a9b36709607..d16ff46ecb9 100644 --- a/helpers/modules-closure.sh +++ b/helpers/modules-closure.sh @@ -16,22 +16,21 @@ for module in $rootModules; do echo "root module: $module" deps=$(modprobe --config /dev/null --set-version "$version" --show-depends "$module" \ | sed 's/^insmod //') - for i in $deps; do echo $i; done + #for i in $deps; do echo $i; done closure="$closure $deps" done -# Remove duplicates. -closure=$(for i in $closure; do echo $i; done | sort | uniq) - echo "closure:" ensureDir $out for module in $closure; do - echo $module target=$(echo $module | sed "s^$kernel^$out^") + if test -e "$target"; then continue; fi + echo $module mkdir -p $(dirname $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 done