From c66b25ccfeeb78032a4ef0295e25ad1e5c49c495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Tue, 28 Jul 2020 14:47:10 +0200 Subject: [PATCH 1/2] sys-apps/systemd: Guard deletion of hwdb.d folder behind use flag Building systemd in the SDK bootstrap failed because the hwdb.d folder did not exist. The upstream ebuild file has this guard: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/systemd/systemd-245.5.ebuild#n390 --- .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 0863aecf35..892e186242 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -379,7 +379,9 @@ multilib_src_install_all() { rmdir "${ED}${rootprefix}"/sbin || die fi - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + if use hwdb; then + rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + fi # Flatcar: Upstream uses keepdir commands to keep some empty # directories. From 8f994d6963a1514e390fd7f99f33f2abd6600b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 29 Jul 2020 12:42:36 +0200 Subject: [PATCH 2/2] sys-apps/baselayout: Work around systemd-tmpfiles not finding libidn2 The baselayout ebuild file calls systemd-tmpfiles but despite that the systemd ebuild file depends on libidn2 through a use flag, it was not built early enough. Ensure that libidn2 is built before baselayout wants to use it. --- .../coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index e62f18c225..1cffcf0b32 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -25,6 +25,7 @@ IUSE="cros_host symlink-usr" # This version of baselayout replaces coreos-base DEPEND="sys-apps/systemd + net-dns/libidn2:= !coreos-base/coreos-base !