mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-17 18:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(sys-apps/baselayout): Replace cros-tmpfiles with systemd-tmpfiles"

Browse Source 
This reverts commit 7bc566630cb05d509371fa09435a08900057b308.
This commit is contained in:
Michael Marineau 2014-03-18 20:39:19 -07:00
parent 33636c026c
commit b70545fadd
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.0-r8.ebuild vendored Symbolic link
View File

@ -0,0 +1 @@
baselayout-9999.ebuild

16
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild vendored
View File

@ -13,7 +13,7 @@ else
KEYWORDS="amd64 arm x86"
fi
inherit cros-workon eutils multilib systemd
inherit cros-workon cros-tmpfiles eutils multilib systemd
DESCRIPTION="Filesystem baselayout for CoreOS"
HOMEPAGE="http://www.coreos.com/"
@ -24,8 +24,7 @@ SLOT="0"
IUSE="cros_host symlink-usr"
# This version of baselayout replaces coreos-base
DEPEND="sys-apps/systemd
!coreos-base/coreos-base
DEPEND="!coreos-base/coreos-base
!<sys-libs/glibc-2.17-r1
!<=sys-libs/nss-usrfiles-2.18.1_pre"
@ -107,19 +106,24 @@ src_install() {
dosym "${LIB_SYMS[$sym]}" "${sym}"
done
if use symlink-usr; then
systemd_dotmpfilesd "${T}/baselayout-usr.conf"
systemd-tmpfiles --root="${D}" --create
for sym in "${!USR_SYMS[@]}" ; do
dosym "${USR_SYMS[$sym]}" "${sym}"
done
fi
emake DESTDIR="${D}" install
if use symlink-usr; then
systemd_dotmpfilesd "${T}/baselayout-usr.conf"
fi
if use cros_host; then
# do not install networkd's resolv.conf symlink in SDK
rm "${D}"/usr/lib/tmpfiles.d/baselayout-resolv.conf || die
fi
# Fill in all other paths defined in tmpfiles configs
systemd-tmpfiles --root="${D}" --create
tmpfiles_create
# handle multilib paths. do it here because we want this behavior
# regardless of the C library that you're using. we do explicitly