Skip to content

Commit 9f07161

Browse files
committed
try incremental=no
1 parent b611da8 commit 9f07161

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

mkosi.conf.d/fedora/mkosi.conf.d/arm64-uki-signed.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ Bootloader=uki-signed
99
# Bootloader=uki-signed. Not available on all Fedora architectures (e.g. ppc64le),
1010
# so kept in arch-specific configs and gated on Bootloader=uki-signed. A separate
1111
# file is needed to match both Architecture= and Bootloader= simultaneously.
12-
# VolatilePackages= is used so this package does not appear in the cache manifest,
13-
# allowing --incremental=strict to reuse the cached image.
14-
VolatilePackages=
12+
Packages=
1513
kernel-uki-virt

mkosi.conf.d/fedora/mkosi.conf.d/x86_64-uki-signed.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ Bootloader=uki-signed
99
# Bootloader=uki-signed. Not available on all Fedora architectures (e.g. ppc64le),
1010
# so kept in arch-specific configs and gated on Bootloader=uki-signed. A separate
1111
# file is needed to match both Architecture= and Bootloader= simultaneously.
12-
# VolatilePackages= is used so this package does not appear in the cache manifest,
13-
# allowing --incremental=strict to reuse the cached image.
14-
VolatilePackages=
12+
Packages=
1513
kernel-uki-virt

tests/test_boot.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,12 @@ def test_bootloader(config: ImageConfig, bootloader: Bootloader) -> None:
8080
firmware = Firmware.linux if bootloader == Bootloader.none else Firmware.auto
8181

8282
with Image(config) as image:
83-
image.build(["--format=disk", "--bootloader", str(bootloader)])
83+
image.build(
84+
[
85+
"--format=disk",
86+
"--bootloader",
87+
str(bootloader),
88+
*(["--incremental=no"] if bootloader == Bootloader.uki_signed else []),
89+
]
90+
)
8491
image.vm(["--firmware", str(firmware)])

0 commit comments

Comments
 (0)