DGNum/liminix
13
0
Fork 1
Code Issues 16 Pull requests 10 Projects Releases Packages Wiki Activity Actions

remove checkedConfig, check all the config

Browse source
This commit is contained in:
Daniel Barlow 2022-10-19 22:09:38 +01:00
parent 9c5b5a54e2
commit 76243d306c
11 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkgs/kernel/default.nix
View file

@ -5,7 +5,6 @@
, lib
, config
, checkedConfig ? {}
, src
, extraPatchPhase ? "true"
} :
@ -16,8 +15,7 @@ let writeConfig = name : config: writeText name
(name: value: (if value == "n" then "# CONFIG_${name} is not set" else "CONFIG_${name}=${value}"))
config
));
kconfigFile = writeConfig "kconfig" (config // checkedConfig);
checkedConfigFile = writeConfig "checked_kconfig" checkedConfig ;
kconfigFile = writeConfig "kconfig" config;
inherit lib; in
stdenv.mkDerivation rec {
name = "kernel";
@ -75,7 +73,7 @@ stdenv.mkDerivation rec {
checkConfigurationPhase = ''
echo Checking required config items:
if comm -2 -3 <(grep 'CONFIG' ${checkedConfigFile} |sort) <(grep 'CONFIG' .config|sort) |grep '.' ; then
if comm -2 -3 <(grep 'CONFIG' ${kconfigFile} |sort) <(grep 'CONFIG' .config|sort) |grep '.' ; then
echo -e "^^^ Some configuration lost :-(\nPerhaps you have mutually incompatible settings, or have disabled options on which these depend.\n"
exit 0
fi