mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-19 13:31:28 +02:00
baselayout: replace cros-tmpfiles with systemd-tmpfiles
Reapply 7bc566630cb05d509371fa09435a08900057b308
This commit is contained in:
parent
ad992cd984
commit
e0ef57130a
@ -13,7 +13,7 @@ else
|
||||
KEYWORDS="amd64 arm x86"
|
||||
fi
|
||||
|
||||
inherit cros-workon cros-tmpfiles eutils multilib systemd
|
||||
inherit cros-workon eutils multilib systemd
|
||||
|
||||
DESCRIPTION="Filesystem baselayout for CoreOS"
|
||||
HOMEPAGE="http://www.coreos.com/"
|
||||
@ -24,7 +24,8 @@ SLOT="0"
|
||||
IUSE="cros_host symlink-usr"
|
||||
|
||||
# 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/nss-usrfiles-2.18.1_pre"
|
||||
|
||||
@ -106,19 +107,14 @@ src_install() {
|
||||
dosym "${LIB_SYMS[$sym]}" "${sym}"
|
||||
done
|
||||
if use symlink-usr; then
|
||||
for sym in "${!USR_SYMS[@]}" ; do
|
||||
dosym "${USR_SYMS[$sym]}" "${sym}"
|
||||
done
|
||||
systemd_dotmpfilesd "${T}/baselayout-usr.conf"
|
||||
systemd-tmpfiles --root="${D}" --create
|
||||
fi
|
||||
|
||||
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
|
||||
tmpfiles_create
|
||||
systemd-tmpfiles --root="${D}" --create
|
||||
|
||||
doenvd "env.d/99coreos_ldpath"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user