| 1 |
commit: fdb1ab241ff0a0b96c723a9b5b68ff8fb0e251ce |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 27 18:11:41 2018 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 27 18:12:34 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb1ab24 |
| 7 |
|
| 8 |
sys-apps/openrc: set libexecdir to lib for bug #645240 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
sys-apps/openrc/openrc-9999.ebuild | 25 ++++++++----------------- |
| 13 |
1 file changed, 8 insertions(+), 17 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild |
| 16 |
index dc6f3b58eab..50d119646c7 100644 |
| 17 |
--- a/sys-apps/openrc/openrc-9999.ebuild |
| 18 |
+++ b/sys-apps/openrc/openrc-9999.ebuild |
| 19 |
@@ -73,7 +73,7 @@ src_compile() { |
| 20 |
|
| 21 |
MAKE_ARGS="${MAKE_ARGS} |
| 22 |
LIBNAME=$(get_libdir) |
| 23 |
- LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc |
| 24 |
+ LIBEXECDIR=${EPREFIX}/lib/rc |
| 25 |
MKBASHCOMP=yes |
| 26 |
MKNET=$(usex newnet) |
| 27 |
MKSELINUX=$(usex selinux) |
| 28 |
@@ -124,9 +124,9 @@ src_install() { |
| 29 |
gen_usr_ldscript librc.so |
| 30 |
|
| 31 |
if ! use kernel_linux; then |
| 32 |
- keepdir /$(get_libdir)/rc/init.d |
| 33 |
+ keepdir /lib/rc/init.d |
| 34 |
fi |
| 35 |
- keepdir /$(get_libdir)/rc/tmp |
| 36 |
+ keepdir /lib/rc/tmp |
| 37 |
|
| 38 |
# Backup our default runlevels |
| 39 |
dodir /usr/share/"${PN}" |
| 40 |
@@ -295,24 +295,15 @@ pkg_postinst() { |
| 41 |
elog "# rc-update add consolefont boot" |
| 42 |
fi |
| 43 |
|
| 44 |
- # Handle the conf.d/local.{start,stop} -> local.d transition |
| 45 |
- if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then |
| 46 |
- elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" |
| 47 |
- elog "files to ${EROOT}etc/local.d" |
| 48 |
- mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start |
| 49 |
- mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop |
| 50 |
- chmod +x "${EROOT}"etc/local.d/*{start,stop} |
| 51 |
- fi |
| 52 |
- |
| 53 |
- if use kernel_linux && [[ "${EROOT}" = "/" ]]; then |
| 54 |
- if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then |
| 55 |
- ewarn "The dependency data could not be migrated to /run/openrc." |
| 56 |
- ewarn "This means you need to reboot your system." |
| 57 |
+ # Added for 0.35. |
| 58 |
+ if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then |
| 59 |
+ if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then |
| 60 |
+ cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib |
| 61 |
fi |
| 62 |
fi |
| 63 |
|
| 64 |
# update the dependency tree after touching all files #224171 |
| 65 |
- [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u |
| 66 |
+ [[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u |
| 67 |
|
| 68 |
if ! use newnet && ! use netifrc; then |
| 69 |
ewarn "You have emerged OpenRc without network support. This" |
Archives