diff options
author | Shea Levy <shea@shealevy.com> | 2012-08-01 06:18:03 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2012-08-01 06:18:03 -0400 |
commit | 3dbfca0d7fd1d680999a86ca56508990d9ebc39e (patch) | |
tree | 6db44fb153e0e3b8c38e7ab8c538193cef96f5d5 /pkgs | |
parent | 6c0b7103c9c22473f07dd0a251798f07ee5e892d (diff) | |
download | nixlib-3dbfca0d7fd1d680999a86ca56508990d9ebc39e.tar nixlib-3dbfca0d7fd1d680999a86ca56508990d9ebc39e.tar.gz nixlib-3dbfca0d7fd1d680999a86ca56508990d9ebc39e.tar.bz2 nixlib-3dbfca0d7fd1d680999a86ca56508990d9ebc39e.tar.lz nixlib-3dbfca0d7fd1d680999a86ca56508990d9ebc39e.tar.xz nixlib-3dbfca0d7fd1d680999a86ca56508990d9ebc39e.tar.zst nixlib-3dbfca0d7fd1d680999a86ca56508990d9ebc39e.zip |
linux/manual-config: Change from 'features' to 'config' and fix build when firmware is installed.
Instead of manually adding which 'features' a kernel has based on its config here, just generate a nixexpr representation of the whole config and let places that need it (e.g. NixOS modules) decide how to map config options to features. Note that if your kernel requires firmware whose hex file sits directly in ${src}/firmware rather than in a subdirectory thereof, you may need this patch for now: https://lkml.org/lkml/2012/7/31/724
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 112 |
1 files changed, 65 insertions, 47 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 41dbbc227602..a9f0b8f052bb 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -4,26 +4,41 @@ with stdenv.lib; let - # Function to parse the config file to get the features supported - readFeatures = config: + # Function to parse the config file into a nix expression + readConfig = configFile: let - configAttrs = import "${runCommand "attrList.nix" {} '' - grep -E -v '(^#|^$)' < ${config} | \ - sed 's/CONFIG_// ; s/=/ /' | \ - awk \ - 'BEGIN { print "{" } - END { print "}" } - { printf "\"%s\" = '"'''"'%s'"'''"';\n", $1, $2 }' > $out + configAttrs = import "${runCommand "config.nix" {} '' + (. ${configFile} + echo "{" + for var in `set`; do + if [[ "$var" =~ ^CONFIG_ ]]; then + IFS="=" + set -- $var + echo "\"$1\" = \"''${*:2}\";" + fi + done + echo "}") > $out ''}"; - getValue = option: - if hasAttr option configAttrs then getAttr option configAttrs else null; - isYes = option: (getValue option) == "y"; - in + config = configAttrs // rec { + attrName = attr: "CONFIG_" + attr; + + isSet = attr: hasAttr (attrName attr) config; + + getValue = attr: if isSet attr then getAttr (attrName attr) config else null; + + isYes = attr: (isSet attr) && ((getValue attr) == "y"); + + isNo = attr: (isSet attr) && ((getValue attr) == "n"); - { - modular = isYes "MODULES"; - }; + isModule = attr: (isSet attr) && ((getValue attr) == "m"); + + isEnabled = attr: (isModule attr) || (isYes attr); + + isDisabled = attr: (!(isSet attr)) || (isNo attr); + }; + in + config; in @@ -37,36 +52,35 @@ in # Any patches patches ? [], # The kernel .config file - config, - # Manually specified features the kernel supports + configfile, + # Manually specified nixexpr representing the config # If unspecified, this will be autodetected from the .config - features ? optionalAttrs allowImportFromDerivation (readFeatures config), + config ? optionalAttrs allowImportFromDerivation (readConfig configfile), # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false }: let - commonMakeFlags = [ - "O=../build" - "INSTALL_PATH=$(out)" - "INSTALLKERNEL=${installkernel}" - ]; - installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' #!/bin/sh mkdir $4 mv -v $2 $4 mv -v $3 $4 '';}; + + isModular = config.isYes "MODULES"; + + installsFirmware = (config.isEnabled "FW_LOADER") && + (isModular || (config.isNo "FIRMWARE_IN_KERNEL")); in -stdenv.mkDerivation ({ +stdenv.mkDerivation { name = "linux-${version}"; enableParallelBuilding = true; passthru = { - inherit version modDirVersion features; + inherit version modDirVersion config; }; inherit patches src; @@ -82,31 +96,22 @@ stdenv.mkDerivation ({ runHook preConfigure mkdir ../build make $makeFlags "''${makeFlagsArray[@]}" mrproper - ln -sv ${config} ../build/.config + ln -sv ${configfile} ../build/.config make $makeFlags "''${makeFlagsArray[@]}" oldconfig rm ../build/.config.old runHook postConfigure ''; - buildNativeInputs = [ perl nettools kmod ]; - - makeFlags = commonMakeFlags; + buildNativeInputs = [ perl nettools ] ++ optional isModular kmod; - meta = { - description = "The Linux kernel"; - license = "GPLv2"; - homepage = http://www.kernel.org/; - maintainers = [ - maintainers.shlevy - ]; - platforms = lib.platforms.linux; - }; -} // optionalAttrs (features ? modular && features.modular) { - makeFlags = commonMakeFlags ++ [ - "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"" - ]; + makeFlags = [ + "O=../build" + "INSTALL_PATH=$(out)" + "INSTALLKERNEL=${installkernel}" + ] ++ (optional isModular "MODLIB=\"$(out)/lib/modules/${modDirVersion}\"") + ++ optional installsFirmware "INSTALL_FW_PATH=\"$(out)/lib/firmware\""; - postInstall = '' + postInstall = if isModular then '' make modules_install $makeFlags "''${makeFlagsArray[@]}" \ $installFlags "''${installFlagsArray[@]}" rm -f $out/lib/modules/${modDirVersion}/{build,source} @@ -115,11 +120,24 @@ stdenv.mkDerivation ({ mv build $out/lib/modules/${modDirVersion}/build unlink $out/lib/modules/${modDirVersion}/build/source ln -sv $out/lib/modules/${modDirVersion}/{,build/}source + '' else optionalString installsFirmware '' + make firmware_install $makeFlags "''${makeFlagsArray[@]}" \ + $installFlags "''${installFlagsArray[@]}" ''; - postFixup = '' + postFixup = optionalString isModular '' if [ -z "$dontStrip" ]; then find $out -name "*.ko" -print0 | xargs -0 strip -S fi ''; -}) + + meta = { + description = "The Linux kernel"; + license = "GPLv2"; + homepage = http://www.kernel.org/; + maintainers = [ + maintainers.shlevy + ]; + platforms = lib.platforms.linux; + }; +} |