commit: 86ee0807e903b2045df3d8d5b10d8617172bfe22 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Jul 30 17:42:22 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Jul 30 17:42:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ee0807
sys-apps/systemd: remove support for split-usr Support was dropped upstream in b0d3095fd6cc1791a38f57a1982116b4475244ba. Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/systemd-9999.ebuild | 48 ++++++------------------------------ 1 file changed, 8 insertions(+), 40 deletions(-) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 2995dae33660..d8fc3cedd386 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -27,7 +27,7 @@ else fi inherit bash-completion-r1 linux-info meson-multilib pam python-single-r1 -inherit secureboot systemd toolchain-funcs udev usr-ldscript +inherit secureboot systemd toolchain-funcs udev DESCRIPTION="System and service manager for Linux" HOMEPAGE="http://systemd.io/"; @@ -181,6 +181,9 @@ QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" QA_EXECSTACK="usr/lib/systemd/boot/efi/*" pkg_pretend() { + if use split-usr; then + die "systemd no longer supports split-usr" + fi if [[ ${MERGE_TYPE} != buildonly ]]; then if use test && has pid-sandbox ${FEATURES}; then ewarn "Tests are known to fail with PID sandboxing enabled." @@ -249,9 +252,6 @@ src_prepare() { ) fi - # Fails with split-usr. - sed -i -e '2i exit 77' test/test-rpm-macros.sh || die - default } @@ -271,10 +271,7 @@ multilib_src_configure() { -Dpamlibdir="$(getpam_mod_dir)" # avoid bash-completion dep -Dbashcompletiondir="$(get_bashcompdir)" - $(meson_use split-usr) - $(meson_use split-usr split-bin) - -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + -Dsplit-bin=false # Disable compatibility with sysvinit -Dsysvinit-path= -Dsysvrcnd-path= @@ -356,9 +353,6 @@ multilib_src_test() { } multilib_src_install_all() { - local rootprefix=$(usex split-usr '' /usr) - local sbin=$(usex split-usr sbin bin) - # meson doesn't know about docdir mv "${ED}"/usr/share/doc/{systemd,${PF}} || die @@ -369,19 +363,15 @@ multilib_src_install_all() { doins "${FILESDIR}"/legacy.conf if ! use resolvconf; then - rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die + rm -f "${ED}"/usr/bin/resolvconf || die fi if ! use sysv-utils; then - rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,shutdown} || die + rm "${ED}"/usr/bin/{halt,init,poweroff,reboot,shutdown} || die rm "${ED}"/usr/share/man/man1/init.1 || die rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 || die fi - if ! use resolvconf && ! use sysv-utils && use split-usr; then - rmdir "${ED}${rootprefix}"/sbin || die - fi - # https://bugs.gentoo.org/761763 rm -r "${ED}"/usr/lib/sysusers.d || die @@ -393,7 +383,7 @@ multilib_src_install_all() { keepdir /etc/udev/hwdb.d - keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown} + keepdir /usr/lib/systemd/{system-sleep,system-shutdown} keepdir /usr/lib/{binfmt.d,modules-load.d} keepdir /usr/lib/systemd/user-generators keepdir /var/lib/systemd @@ -403,14 +393,6 @@ multilib_src_install_all() { newpamd "${FILESDIR}"/systemd-user.pam systemd-user fi - if use split-usr; then - # Avoid breaking boot/reboot - dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd - dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown - fi - - gen_usr_ldscript -a systemd udev - if use boot; then python_fix_shebang "${ED}" secureboot_auto_sign @@ -467,20 +449,6 @@ pkg_preinst() { dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf fi - if ! use split-usr; then - local dir - for dir in bin sbin lib usr/sbin; do - if [[ ! -L ${EROOT}/${dir} ]]; then - eerror "'${EROOT}/${dir}' is not a symbolic link." - FAIL=1 - fi - done - if [[ ${FAIL} ]]; then - eerror "Migration to system layout with merged directories must be performed before" - eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage." - die "System layout with split directories still used" - fi - fi if ! use boot && has_version "sys-apps/systemd[gnuefi(-)]"; then ewarn "The 'gnuefi' USE flag has been renamed to 'boot'." ewarn "Make sure to enable the 'boot' USE flag if you use systemd-boot."
