summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-06-22 09:23:29 -0400
committerLennart Poettering <lennart@poettering.net>2017-06-22 15:23:29 +0200
commit670d4946905ff7b6769728f7988c412b3d2f678e (patch)
tree1cc8151cedd8b57fedb7266eb6e75de6b729c3b4
parentf778b8fe27c794d079764104f95a0add8da21362 (diff)
downloadsystemd-670d4946905ff7b6769728f7988c412b3d2f678e.tar.gz
systemd-670d4946905ff7b6769728f7988c412b3d2f678e.tar.bz2
systemd-670d4946905ff7b6769728f7988c412b3d2f678e.zip
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.
-rw-r--r--.mkosi/mkosi.arch3
-rw-r--r--.mkosi/mkosi.debian1
-rw-r--r--.mkosi/mkosi.fedora3
3 files changed, 7 insertions, 0 deletions
diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index b4a50f4bc8..613ef4746f 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 2e948af3fc..c41fc1d419 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 d36d167d94..731e1c792c 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -70,3 +70,6 @@ BuildPackages=
qrencode-devel
tree
xz-devel
+
+Packages=
+ libidn2