diff --git a/pkgs/os-specific/linux/kernelscripts/builder.sh b/pkgs/os-specific/linux/kernelscripts/builder.sh index 780b71c19706..9485892b27b6 100755 --- a/pkgs/os-specific/linux/kernelscripts/builder.sh +++ b/pkgs/os-specific/linux/kernelscripts/builder.sh @@ -11,6 +11,7 @@ for i in $createModules; do -e "s^@coreutils\@^$coreutils^g" \ -e "s^@findutils\@^$findutils^g" \ -e "s^@kernelpkgs\@^$kernelpkgs^g" \ + -e "s^@module_init_tools\@^$module_init_tools^g" \ -e "s^@nix\@^$nix^g" \ < $i > $dst chmod +x $dst diff --git a/pkgs/os-specific/linux/kernelscripts/create-modules.sh b/pkgs/os-specific/linux/kernelscripts/create-modules.sh index 0bb9b4ae6df4..2e802823da8c 100755 --- a/pkgs/os-specific/linux/kernelscripts/create-modules.sh +++ b/pkgs/os-specific/linux/kernelscripts/create-modules.sh @@ -5,12 +5,14 @@ archivesDir=/ 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 -)) 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 kernelVersion=$(cd $kernel/lib/modules/; @coreutils@/bin/ls -d *) @@ -45,3 +47,7 @@ cd $ov511 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/% + +echo running depmod + +@module_init_tools@/sbin/depmod -ae diff --git a/pkgs/os-specific/linux/kernelscripts/default.nix b/pkgs/os-specific/linux/kernelscripts/default.nix index b5d5d37fa196..e6df3e1b3fc0 100644 --- a/pkgs/os-specific/linux/kernelscripts/default.nix +++ b/pkgs/os-specific/linux/kernelscripts/default.nix @@ -1,10 +1,10 @@ -{ stdenv, coreutils, nix, findutils}: +{ stdenv, coreutils, nix, findutils, module_init_tools }: derivation { name = "kernelscripts"; system = stdenv.system; builder = ./builder.sh; createModules = ./create-modules.sh; - inherit stdenv coreutils nix findutils; + inherit stdenv coreutils nix findutils module_init_tools; kernelpkgs = ./kernel.nix; }