summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mkosi/mkosi.fedora1
-rw-r--r--test/mkosi.default.networkd-test17
2 files changed, 11 insertions, 7 deletions
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 56d3ba887a..048bfa8497 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -53,6 +53,7 @@ BuildPackages=
lz4-devel
m4
meson
+ ninja-build
openssl-devel
p11-kit-devel
pam-devel
diff --git a/test/mkosi.default.networkd-test b/test/mkosi.default.networkd-test
index 4ef3d392dd..c4fa569d41 100644
--- a/test/mkosi.default.networkd-test
+++ b/test/mkosi.default.networkd-test
@@ -1,11 +1,14 @@
# Puts together an nspawn container and runs networkd-test.py in it, inside a
-# network namespace and everything. Run this with "mkosi
-# --default=mkosi.default.networkd-test boot". This will start the test and
-# eventually exit with success in case the test succeeded.
+# network namespace and everything. Run this with
+#
+# mkosi -C test --default=mkosi.default.networkd-test boot
+#
+# This will start the test and eventually exit with success in case the test
+# succeeded.
[Distribution]
Distribution=fedora
-Release=29
+Release=32
[Output]
Format=raw_btrfs
@@ -51,6 +54,7 @@ BuildPackages=
lz4-devel
m4
meson
+ ninja-build
pam-devel
pcre2-devel
pkgconfig
@@ -58,7 +62,6 @@ BuildPackages=
python3-lxml
qrencode-devel
tree
- xz-devel
Packages=
dnsmasq
@@ -68,8 +71,8 @@ Packages=
python3
# Share caches with the top-level mkosi
-BuildDirectory=../mkosi.builddir
-Cache=../mkosi.cache
+BuildDirectory=../mkosi/mkosi.builddir
+Cache=../mkosi/mkosi.cache
# Run our own script
BuildScript=mkosi.build.networkd-test