run depmod as well after having rebuilt everything
svn path=/nixpkgs/trunk/; revision=5865
This commit is contained in:
parent
7460d6f3a2
commit
66c10e00e8
@ -11,6 +11,7 @@ for i in $createModules; do
|
|||||||
-e "s^@coreutils\@^$coreutils^g" \
|
-e "s^@coreutils\@^$coreutils^g" \
|
||||||
-e "s^@findutils\@^$findutils^g" \
|
-e "s^@findutils\@^$findutils^g" \
|
||||||
-e "s^@kernelpkgs\@^$kernelpkgs^g" \
|
-e "s^@kernelpkgs\@^$kernelpkgs^g" \
|
||||||
|
-e "s^@module_init_tools\@^$module_init_tools^g" \
|
||||||
-e "s^@nix\@^$nix^g" \
|
-e "s^@nix\@^$nix^g" \
|
||||||
< $i > $dst
|
< $i > $dst
|
||||||
chmod +x $dst
|
chmod +x $dst
|
||||||
|
@ -5,12 +5,14 @@ archivesDir=/
|
|||||||
|
|
||||||
cpwd=@coreutils@/bin/pwd
|
cpwd=@coreutils@/bin/pwd
|
||||||
|
|
||||||
storeExpr=$(@nix@/bin/nix-store -qR $(@nix@/bin/nix-store -r $(echo '(import @kernelpkgs@).everything' | @nix@/bin/nix-instantiate -)))
|
#storeExpr=$(@nix@/bin/nix-store -qR $(@nix@/bin/nix-store -r $(echo '(import @kernelpkgs@).everything' | @nix@/bin/nix-instantiate -)))
|
||||||
|
|
||||||
kernel=$(@nix@/bin/nix-store -r $(echo '(import @kernelpkgs@).kernel' | @nix@/bin/nix-instantiate -))
|
kernel=$(@nix@/bin/nix-store -r $(echo '(import @kernelpkgs@).kernel' | @nix@/bin/nix-instantiate -))
|
||||||
|
|
||||||
ov511=$(@nix@/bin/nix-store -r $(echo '(import @kernelpkgs@).ov511' | @nix@/bin/nix-instantiate -))
|
ov511=$(@nix@/bin/nix-store -r $(echo '(import @kernelpkgs@).ov511' | @nix@/bin/nix-instantiate -))
|
||||||
|
|
||||||
|
module_init_tools=$(@nix@/bin/nix-store -r $(echo '(import @kernelpkgs@).module_init_tools' | @nix@/bin/nix-instantiate -))
|
||||||
|
|
||||||
#echo making kernel stuff
|
#echo making kernel stuff
|
||||||
|
|
||||||
kernelVersion=$(cd $kernel/lib/modules/; @coreutils@/bin/ls -d *)
|
kernelVersion=$(cd $kernel/lib/modules/; @coreutils@/bin/ls -d *)
|
||||||
@ -45,3 +47,7 @@ cd $ov511
|
|||||||
echo linking ov511 modules
|
echo linking ov511 modules
|
||||||
|
|
||||||
@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $ov511/% $archivesDir/%
|
@findutils@/bin/find . -not -path "./lib/modules/$kernelVersion/build*" -type f | @findutils@/bin/xargs -n 1 -i% @coreutils@/bin/ln -s $ov511/% $archivesDir/%
|
||||||
|
|
||||||
|
echo running depmod
|
||||||
|
|
||||||
|
@module_init_tools@/sbin/depmod -ae
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
{ stdenv, coreutils, nix, findutils}:
|
{ stdenv, coreutils, nix, findutils, module_init_tools }:
|
||||||
|
|
||||||
derivation {
|
derivation {
|
||||||
name = "kernelscripts";
|
name = "kernelscripts";
|
||||||
system = stdenv.system;
|
system = stdenv.system;
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
createModules = ./create-modules.sh;
|
createModules = ./create-modules.sh;
|
||||||
inherit stdenv coreutils nix findutils;
|
inherit stdenv coreutils nix findutils module_init_tools;
|
||||||
kernelpkgs = ./kernel.nix;
|
kernelpkgs = ./kernel.nix;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user