summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-05-16 20:57:59 +0000
committerWilliam Hubbs <williamh@gentoo.org>2012-05-16 20:57:59 +0000
commitc5558860144ad9959062b8d87fbda40d92473f2d (patch)
tree01dc7daeb2d2444266f2a1369c412afa5d397311 /sys-apps
parentInitial commit for notmuch (#389831) (diff)
downloadgentoo-2-c5558860144ad9959062b8d87fbda40d92473f2d.tar.gz
gentoo-2-c5558860144ad9959062b8d87fbda40d92473f2d.tar.bz2
gentoo-2-c5558860144ad9959062b8d87fbda40d92473f2d.zip
update live ebuild for migration to /run on linux systems.
(Portage version: 2.2.0_alpha105/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/openrc/ChangeLog5
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild16
2 files changed, 17 insertions, 4 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index dbc8519ad731..c114ceb43b08 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.218 2012/04/26 14:32:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.219 2012/05/16 20:57:59 williamh Exp $
+
+ 16 May 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ update live ebuild for migration to /run on linux systems.
26 Apr 2012; Alexis Ballier <aballier@gentoo.org> openrc-0.9.9.3.ebuild,
openrc-9999.ebuild:
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 072a86eb553a..02fdd13d4112 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.100 2012/04/26 14:32:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.101 2012/05/16 20:57:59 williamh Exp $
EAPI=4
@@ -25,7 +25,7 @@ RDEPEND="virtual/init
elibc_glibc? ( >=sys-libs/glibc-2.5 )
ncurses? ( sys-libs/ncurses )
pam? ( sys-auth/pambase )
- >=sys-apps/baselayout-2.0.0
+ >=sys-apps/baselayout-2.1-r1
kernel_linux? (
sys-process/psmisc
)
@@ -106,7 +106,10 @@ src_install() {
gen_usr_ldscript libeinfo.so
gen_usr_ldscript librc.so
- keepdir /$(get_libdir)/rc/{init.d,tmp}
+ if ! use kernel_linux; then
+ keepdir /$(get_libdir)/rc/init.d
+ fi
+ keepdir /$(get_libdir)/rc/tmp
# Backup our default runlevels
dodir /usr/share/"${PN}"
@@ -415,6 +418,13 @@ pkg_postinst() {
chmod +x "${ROOT}"etc/local.d/*{start,stop}
fi
+ if use kernel_linux && [[ "${ROOT}" = "/" ]]; then
+ if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+ ewarn "The dependency data could not be migrated to /run/openrc."
+ ewarn "This means you need to reboot your system."
+ fi
+ fi
+
# update the dependency tree after touching all files #224171
[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u