Skip to content

Commit ca21e60

Browse files
committed
mkosi.debian.default.tmpl: overdue compatibility with v15
mkosi versions v15 and above need a lot more explicit Packages= like "?priority(important)" and "task ssh-server". mkosi v15 changed everything, see systemd/mkosi#1971 Missing packages caused a lot of issues like #168, #171, #199 and maybe others. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
1 parent 5723a59 commit ca21e60

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

mkosi.debian.default.tmpl

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1+
# mkosi versions v15 and above need a lot more explicit Packages= like
2+
# "?priority(important)" and "task ssh-server". mkosi v15 changed
3+
# everything, see https://github.com/systemd/mkosi/issues/1971
4+
15
[Content]
26
Packages=
7+
?priority(important)
8+
task-ssh-server
9+
libnss-resolve
10+
login
11+
systemd-boot
312
asciidoctor
413
autoconf
514
automake
615
bash-completion
716
build-essential
817
cmake
18+
command-not-found
919
fio
1020
gdb
1121
git
@@ -26,9 +36,14 @@ Packages=
2636
meson
2737
ndctl
2838
openssh-client
29-
openssh-server
3039
pkgconf
3140
python3
3241
strace
42+
# Trixie needs this one for compiling ndctl, but no such package in
43+
# Bookworm. ?(exact-name ...) is used as a trick not to fail when
44+
# it's missing. We can't use mkosi [Match] yet because it's too
45+
# recent. If this grows out of control then we should switch to
46+
# run_qemu.sh concatenating different files based on the revision.
47+
?exact-name(systemd-dev)
3348
uuid-dev
3449
vim

0 commit comments

Comments
 (0)