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:
@@ -24,7 +24,7 @@ in {
|
||||
cd $out
|
||||
${if wantsDtb then "cp ${o.dtb} dtb" else "true"}
|
||||
cp ${o.initramfs} initramfs
|
||||
cp ${o.zimage} kernel
|
||||
cp ${o.kernel.zImage} kernel
|
||||
mkdir extlinux
|
||||
cat > extlinux/extlinux.conf << _EOF
|
||||
menu title Liminix
|
||||
|
@@ -61,7 +61,7 @@ in {
|
||||
o = config.system.outputs;
|
||||
image = let choices = {
|
||||
uimage = o.uimage;
|
||||
zimage = o.zimage;
|
||||
zimage = o.kernel.zImage;
|
||||
}; in choices.${cfg.kernelFormat};
|
||||
bootCommand = let choices = {
|
||||
uimage = "bootm";
|
||||
|
Reference in New Issue
Block a user