From 050b4981e0829497e9b87ac8c38e4a367d229987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 17 Sep 2020 15:50:59 +0200
Subject: [PATCH 1/2] mkosi: stop pulling in libtool

Not useful since 72cdb3e783.
---
 .mkosi/mkosi.arch                | 1 -
 .mkosi/mkosi.debian              | 1 -
 .mkosi/mkosi.ubuntu              | 1 -
 test/mkosi.default.networkd-test | 1 -
 4 files changed, 4 deletions(-)

diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index cb1952206d..3ac3d55e4a 100644
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -39,7 +39,6 @@ BuildPackages=
         libidn2
         libmicrohttpd
         libseccomp
-        libtool
         libutil-linux
         libxkbcommon
         libxslt
diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index db9bd3550e..cf2e3dfa0d 100644
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -48,7 +48,6 @@ BuildPackages=
         libqrencode-dev
         libseccomp-dev
         libsmartcols-dev
-        libtool
         libxkbcommon-dev
         libzstd-dev
         m4
diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu
index 8dcc67a662..3e97beebaf 100644
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@@ -50,7 +50,6 @@ BuildPackages=
         libqrencode-dev
         libseccomp-dev
         libsmartcols-dev
-        libtool
         libxkbcommon-dev
         libxtables-dev
         libzstd-dev
diff --git a/test/mkosi.default.networkd-test b/test/mkosi.default.networkd-test
index 6032c33c3a..4ef3d392dd 100644
--- a/test/mkosi.default.networkd-test
+++ b/test/mkosi.default.networkd-test
@@ -45,7 +45,6 @@ BuildPackages=
         libmount-devel
         libseccomp-devel
         libselinux-devel
-        libtool
         libxkbcommon-devel
         libxslt
         lz4

From d688c5d653f8d49ec9355feb0e62a53d45fac95c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 17 Sep 2020 15:51:34 +0200
Subject: [PATCH 2/2] mkosi: update rules in mkosi.default.networkd-test boot

We need to include ninja-build in the packages list because meson doesn't
depend on it (because it supports other backends too).

Also drop xz-devel, it's not crucial for the test.
---
 .mkosi/mkosi.fedora              |  1 +
 test/mkosi.default.networkd-test | 17 ++++++++++-------
 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