diff options
author | Nikolay Amiantov <ab@fmap.me> | 2018-01-08 16:13:28 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-02-16 00:11:07 +0200 |
commit | 56e0943b0855c7b0501f84d4ce43e083b9d13b27 (patch) | |
tree | 1a88c0e3a7980e0eafbf538199f1cf2436a9c75a /pkgs/build-support/kernel | |
parent | 0be2746fc2626fe26a34f2f729ce61aa440f8b97 (diff) | |
download | nixlib-56e0943b0855c7b0501f84d4ce43e083b9d13b27.tar nixlib-56e0943b0855c7b0501f84d4ce43e083b9d13b27.tar.gz nixlib-56e0943b0855c7b0501f84d4ce43e083b9d13b27.tar.bz2 nixlib-56e0943b0855c7b0501f84d4ce43e083b9d13b27.tar.lz nixlib-56e0943b0855c7b0501f84d4ce43e083b9d13b27.tar.xz nixlib-56e0943b0855c7b0501f84d4ce43e083b9d13b27.tar.zst nixlib-56e0943b0855c7b0501f84d4ce43e083b9d13b27.zip |
makeModulesClosure: support firmware
Link it in stage 1.
Diffstat (limited to 'pkgs/build-support/kernel')
-rw-r--r-- | pkgs/build-support/kernel/modules-closure.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/kernel/modules-closure.sh | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix index 9940e611124c..a527770adcd7 100644 --- a/pkgs/build-support/kernel/modules-closure.nix +++ b/pkgs/build-support/kernel/modules-closure.nix @@ -3,13 +3,13 @@ # the modules identified by `rootModules', plus their dependencies. # Also generate an appropriate modules.dep. -{ stdenvNoCC, kernel, nukeReferences, rootModules +{ stdenvNoCC, kernel, firmware, nukeReferences, rootModules , kmod, allowMissing ? false }: stdenvNoCC.mkDerivation { name = kernel.name + "-shrunk"; builder = ./modules-closure.sh; buildInputs = [ nukeReferences kmod ]; - inherit kernel rootModules allowMissing; + inherit kernel firmware rootModules allowMissing; allowedReferences = ["out"]; } diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 8a31c760da07..8287c1672d06 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -33,4 +33,13 @@ for module in $closure; do echo $target >> $out/insmod-list done +mkdir -p $out/lib/firmware +for module in $closure; do + for i in $(modinfo -F firmware $module); do + mkdir -p "$out/lib/firmware/$(dirname "$i")" + echo "firmware for $module: $i" + cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi + done +done + depmod -b $out -a $version |