mkosi: install libidn2 in the final system (#6173)

Recent systemd compiled in a build root which had libidn2-devel installed would
not run in the default installation root which had just libidn and did not have
libidn2. Since a8a2a0ed64f727c82e libidn2-devel (or equivalent) is installed in
the build root. Normally, since we install systemd in the installation root,
all dependencies that are needed for the compiled systemd to run are present,
but libidn2 is a new dependency, so the distro packages would just pull in
libidn, and not libidn2.

Temporily add libdn2 to explicitly specified Packages. We can remove that once
distro-compiled systemds have moved to libind2.

diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index b4a50f4bc841c8b0830181821016ff9999418188..613ef4746f83f17380cba3bbadf2073ef8dcdf24 100644 (file)
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -63,3 +63,6 @@ BuildPackages=
         python-lxml
         qrencode
         xz
+
+Packages=
+        libidn2

diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index 2e948af3fc84354849976d8d91120260acfb80e1..c41fc1d4197ca1cca17feef1490c0f4b2acd5e98 100644 (file)
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -77,3 +77,4 @@ BuildPackages=
 Packages=
         libqrencode3
         locales
+        libidn2-0

diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index d36d167d94b92f938aa8453328ac50846aaa442f..731e1c792cc06fe835a6c70135455dcd50e49f59 100644 (file)
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -70,3 +70,6 @@ BuildPackages=
         qrencode-devel
         tree
         xz-devel
+
+Packages=
+        libidn2