outputs.zimage -> outputs.kernel.zImage

remove config option/derivation in favour of accessing
as output of the kernel derivation (matches what we do
with e.g. modulesupport)
This commit is contained in:
Daniel Barlow
2024-12-22 17:27:59 +00:00
parent ebb4d4a831
commit ac189f2977
4 changed files with 8 additions and 22 deletions

View File

@@ -68,19 +68,15 @@ in {
};
};
config = {
system.outputs =
system.outputs.kernel =
let
mergedConfig = mergeConditionals
config.kernel.config
config.kernel.conditionalConfig;
k = liminix.builders.kernel.override {
config = mergedConfig;
inherit (config.kernel) version src extraPatchPhase;
targets = config.kernel.makeTargets;
};
in {
kernel = k.vmlinux;
zimage = k.zImage;
in liminix.builders.kernel.override {
config = mergedConfig;
inherit (config.kernel) version src extraPatchPhase;
targets = config.kernel.makeTargets;
};
kernel = rec {