mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-19 21:41:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

baselayout: replace cros-tmpfiles with systemd-tmpfiles

Browse Source 
Reapply 7bc566630cb05d509371fa09435a08900057b308
This commit is contained in:
Michael Marineau 2014-03-18 19:32:18 -07:00
parent ad992cd984
commit e0ef57130a
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.6.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.0.7.ebuild vendored
View File

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" KEYWORDS="amd64 arm x86"
fi fi
inherit cros-workon cros-tmpfiles eutils multilib systemd inherit cros-workon eutils multilib systemd
DESCRIPTION="Filesystem baselayout for CoreOS" DESCRIPTION="Filesystem baselayout for CoreOS"
HOMEPAGE="http://www.coreos.com/" HOMEPAGE="http://www.coreos.com/"
@ -24,7 +24,8 @@ SLOT="0"
IUSE="cros_host symlink-usr" IUSE="cros_host symlink-usr"
# This version of baselayout replaces coreos-base # This version of baselayout replaces coreos-base
DEPEND="!coreos-base/coreos-base DEPEND="sys-apps/systemd
!coreos-base/coreos-base
!<sys-libs/glibc-2.17-r1 !<sys-libs/glibc-2.17-r1
!<=sys-libs/nss-usrfiles-2.18.1_pre" !<=sys-libs/nss-usrfiles-2.18.1_pre"
@ -106,19 +107,14 @@ src_install() {
dosym "${LIB_SYMS[$sym]}" "${sym}" dosym "${LIB_SYMS[$sym]}" "${sym}"
done done
if use symlink-usr; then if use symlink-usr; then
for sym in "${!USR_SYMS[@]}" ; do systemd_dotmpfilesd "${T}/baselayout-usr.conf"
dosym "${USR_SYMS[$sym]}" "${sym}" systemd-tmpfiles --root="${D}" --create
done
fi fi
emake DESTDIR="${D}" install emake DESTDIR="${D}" install
if use symlink-usr; then
systemd_dotmpfilesd "${T}/baselayout-usr.conf"
fi
# Fill in all other paths defined in tmpfiles configs # Fill in all other paths defined in tmpfiles configs
tmpfiles_create systemd-tmpfiles --root="${D}" --create
doenvd "env.d/99coreos_ldpath" doenvd "env.d/99coreos_ldpath"