From f4a1c7f89fdfedc29fd5c3afb039fc7195613f7c Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Sun, 27 Jan 2019 18:16:51 -0600 Subject: [PATCH] fix systemd import-tar for gentoo use a newer version of systemd Fixes https://review.openstack.org/#/c/608102 Change-Id: I23fd671adb893f3abd9fbc65382f2aec5a317c24 --- .../elements/gentoo/pre-install.d/02-gentoo-02-flags | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags index e38c07634..d8d57aecf 100755 --- a/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags +++ b/diskimage_builder/elements/gentoo/pre-install.d/02-gentoo-02-flags @@ -30,6 +30,11 @@ echo 'sys-boot/grub device-mapper' >> /etc/portage/package.use/grub # needed in order to install pip packages as root echo '=dev-python/pip-9.0.1-r2 ~amd64' >> /etc/portage/package.keywords/pip +if [[ "${GENTOO_PROFILE}" == *"systemd"* ]]; then + # systemd import-tar is broken, use a more recent (fixed) version + echo '~sys-apps/systemd-241 ~amd64' >> /etc/portage/package.keywords/systemd +fi + if [[ "${GENTOO_PROFILE}" == *"musl"* ]]; then echo "dev-vcs/git -gpg" >> /etc/portage/package.use/musl # gpg doesn't build on musl profiles echo "=sys-block/open-iscsi-2.0.874-r1 ~amd64" >> /etc/portage/package.keywords/musl