diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-13 17:49:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-13 17:49:31 +0100 |
commit | 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (patch) | |
tree | d9d1fbc20509d4c90f57fb2d9e1459bc8034c831 /sys-apps/systemd/systemd-9999.ebuild | |
parent | a1392efe64137262023d92492396ca9156d22396 (diff) |
Revert "gentoo resync : 13.09.2019"
This reverts commit a1392efe64137262023d92492396ca9156d22396.
Diffstat (limited to 'sys-apps/systemd/systemd-9999.ebuild')
-rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 267a18fcc1cf..f00c416fa382 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -354,7 +354,10 @@ multilib_src_install_all() { # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die + local udevdir=/lib/udev + use split-usr || udevdir=/usr/lib/udev + + rm -r "${ED}${udevdir}/hwdb.d" || die if use split-usr; then # Avoid breaking boot/reboot @@ -419,22 +422,6 @@ save_enabled_units() { pkg_preinst() { save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service - - if ! use split-usr; then - local dir - for dir in bin sbin lib; do - if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then - eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged." - eerror "One of them should be a symbolic link to the other one." - FAIL=1 - fi - done - if [[ ${FAIL} ]]; then - eerror "Migration to system layout with merged directories must be performed before" - eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." - die "System layout with split directories still used" - fi - fi } pkg_postinst() { |