From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 22 Jun 2017 13:23:29 +0000 (-0400)
Subject: mkosi: install libidn2 in the final system (#6173)
X-Git-Tag: v234~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=670d4946905ff7b6769728f7988c412b3d2f678e;p=thirdparty%2Fsystemd.git

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 b4a50f4bc84..613ef4746f8 100644
--- 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 2e948af3fc8..c41fc1d4197 100644
--- 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 d36d167d94b..731e1c792cc 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -70,3 +70,6 @@ BuildPackages=
         qrencode-devel
         tree
         xz-devel
+
+Packages=
+        libidn2