Skip to content

Commit

Permalink
Revert "run_qemu: switch mkosi to not build unified kernel images"
Browse files Browse the repository at this point in the history
mkosi.generic.conf.tmpl: re-enable UnifiedKernelImages

This reverts commit 92ac465

The build of the Unified Kernel Image was disabled 18 months ago but
no one can remember now what problem this solved at the time. It
should be possible to just ignore this byproduct.

For some unknown reason, reverting this fixes the build on Ubuntu
22.04 with mkosi version 12:
```
running: sudo -E mkosi -i -f --autologin build
Error: Sorry, --without-unified-kernel-images is not supported in
UEFI mode on this distro.
```

Reverting this also helps the (upcoming) compatibility with mkosi v15+
because this option has been entirely removed from mkosi v15+! Quoting
any recent mkosi/NEWS.md:

```
    v15

    We also remove the WithoutUnifiedKernelImages= switch as building
    unified kernel images is trivial and fast these days.
```

Signed-off-by: Marc Herbert <[email protected]>
  • Loading branch information
marc-hb committed Dec 3, 2024
1 parent 8e02f9f commit bb55787
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion mkosi.generic.conf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ ESPSize=@ESP_SIZE@
[Output]
Format=gpt_ext4
Bootable=yes
WithUnifiedKernelImages=no
Output=@ROOT_FS@

0 comments on commit bb55787

Please sign in to comment.