* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2012-02-13 15:31 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2012-02-13 15:31 UTC (permalink / raw
To: gentoo-commits
williamh 12/02/13 15:31:58
Modified: openrc-9999.ebuild ChangeLog
Log:
add swapfiles to the boot runlevel
(Portage version: 2.2.0_alpha85/cvs/Linux i686)
Revision Changes Path
1.98 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.97&r2=1.98
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- openrc-9999.ebuild 14 Dec 2011 17:18:20 -0000 1.97
+++ openrc-9999.ebuild 13 Feb 2012 15:31:58 -0000 1.98
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.97 2011/12/14 17:18:20 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.98 2012/02/13 15:31:58 williamh Exp $
EAPI=4
@@ -235,6 +235,9 @@
# termencoding was added in 0.2.1 and needed in boot
has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+ # swapfiles was added in 0.9.9 and needed in boot (february 2012)
+ has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
# set default interactive shell to sulogin if it exists
set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
1.211 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.211&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.211&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.210&r2=1.211
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- ChangeLog 8 Feb 2012 16:48:04 -0000 1.210
+++ ChangeLog 13 Feb 2012 15:31:58 -0000 1.211
@@ -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.210 2012/02/08 16:48:04 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.211 2012/02/13 15:31:58 williamh Exp $
+
+ 13 Feb 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ add swapfiles to the boot runlevel
08 Feb 2012; William Hubbs <williamh@gentoo.org> -openrc-0.9.8.1.ebuild,
-openrc-0.9.8.2.ebuild, -openrc-0.9.8.ebuild:
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2012-05-16 20:57 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2012-05-16 20:57 UTC (permalink / raw
To: gentoo-commits
williamh 12/05/16 20:57:59
Modified: openrc-9999.ebuild ChangeLog
Log:
update live ebuild for migration to /run on linux systems.
(Portage version: 2.2.0_alpha105/cvs/Linux i686)
Revision Changes Path
1.101 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.100&r2=1.101
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- openrc-9999.ebuild 26 Apr 2012 14:32:48 -0000 1.100
+++ openrc-9999.ebuild 16 May 2012 20:57:59 -0000 1.101
@@ -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 @@
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 @@
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 @@
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
1.219 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.219&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.219&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.218&r2=1.219
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- ChangeLog 26 Apr 2012 14:32:48 -0000 1.218
+++ ChangeLog 16 May 2012 20:57:59 -0000 1.219
@@ -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:
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2012-09-27 19:04 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2012-09-27 19:04 UTC (permalink / raw
To: gentoo-commits
williamh 12/09/27 19:04:00
Modified: openrc-9999.ebuild ChangeLog
Log:
Add prefix support for bug #415899. I would like to thank Benda Xu for working with me on this.
(Portage version: 2.2.0_alpha133/cvs/Linux i686)
Revision Changes Path
1.103 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.102&r2=1.103
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- openrc-9999.ebuild 10 Jul 2012 18:01:47 -0000 1.102
+++ openrc-9999.ebuild 27 Sep 2012 19:04:00 -0000 1.103
@@ -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.102 2012/07/10 18:01:47 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.103 2012/09/27 19:04:00 williamh Exp $
EAPI=4
@@ -18,7 +18,7 @@
LICENSE="BSD-2"
SLOT="0"
-IUSE="debug elibc_glibc ncurses pam newnet selinux static-libs unicode
+IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs unicode
kernel_linux kernel_FreeBSD"
RDEPEND="virtual/init
@@ -37,7 +37,9 @@
make_args() {
unset LIBDIR #266688
- MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
+ MAKE_ARGS="${MAKE_ARGS}
+ LIBNAME=$(get_libdir)
+ LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc"
local brand="Unknown"
if use kernel_linux ; then
@@ -55,6 +57,7 @@
MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no"
fi
use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet"
+ use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
}
pkg_setup() {
@@ -86,7 +89,7 @@
# set_config <file> <option name> <yes value> <no value> test
# a value of "#" will just comment out the option
set_config() {
- local file="${D}/$1" var=$2 val com
+ local file="${ED}/$1" var=$2 val com
eval "${@:5}" && val=$3 || val=$4
[[ ${val} == "#" ]] && com="#" && val='\2'
sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
@@ -115,8 +118,8 @@
# Backup our default runlevels
dodir /usr/share/"${PN}"
- cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
- rm -rf "${D}"/etc/runlevels
+ cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+ rm -rf "${ED}"/etc/runlevels
# Install the default net configuration
doconfd conf.d/net
@@ -169,6 +172,8 @@
}
pkg_preinst() {
+ use prefix && return 0
+
local f LIBDIR=$(get_libdir)
# default net script is just comments, so no point in biting people
@@ -346,6 +351,8 @@
}
pkg_postinst() {
+ use prefix && return 0
+
local LIBDIR=$(get_libdir)
# Remove old baselayout links
1.227 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.227&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.227&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.226&r2=1.227
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- ChangeLog 9 Sep 2012 18:41:55 -0000 1.226
+++ ChangeLog 27 Sep 2012 19:04:00 -0000 1.227
@@ -1,6 +1,10 @@
# 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.226 2012/09/09 18:41:55 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.227 2012/09/27 19:04:00 williamh Exp $
+
+ 27 Sep 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Add prefix support for bug #415899. I would like to thank Benda Xu for working
+ with me on this.
09 Sep 2012; William Hubbs <williamh@gentoo.org> -openrc-0.10.1.ebuild,
-openrc-0.10.2.ebuild, -openrc-0.10.3.ebuild, -openrc-0.10.ebuild,
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2012-09-28 16:32 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2012-09-28 16:32 UTC (permalink / raw
To: gentoo-commits
williamh 12/09/28 16:32:31
Modified: openrc-9999.ebuild ChangeLog
Log:
Fix the ebuild so we can use pre/postinst on prefix systems as well.
Originally I did not think we needed this, but thinking it over it is
better to have them. Also this reworks the live portion of the ebuild to
use a separate inherit call.
(Portage version: 2.2.0_alpha134/cvs/Linux i686)
Revision Changes Path
1.104 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.103&r2=1.104
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- openrc-9999.ebuild 27 Sep 2012 19:04:00 -0000 1.103
+++ openrc-9999.ebuild 28 Sep 2012 16:32:31 -0000 1.104
@@ -1,17 +1,18 @@
# 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.103 2012/09/27 19:04:00 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.104 2012/09/28 16:32:31 williamh Exp $
EAPI=4
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
-[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
-inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS}
-unset SCM_ECLASS
+inherit eutils flag-o-matic multilib pam toolchain-funcs
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
-if [[ ${PV} != "9999" ]] ; then
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
+ inherit git-2
+else
SRC_URI="mirror://gentoo/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
fi
@@ -101,12 +102,12 @@
src_install() {
make_args
- emake ${MAKE_ARGS} DESTDIR="${D}" install
+ emake ${MAKE_ARGS} DESTDIR="${ED}" install
# move the shared libs back to /usr so ldscript can install
# more of a minimal set of files
# disabled for now due to #270646
- #mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die
+ #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
#gen_usr_ldscript -a einfo rc
gen_usr_ldscript libeinfo.so
gen_usr_ldscript librc.so
@@ -132,7 +133,7 @@
# On HPPA, do not run consolefont by default (bug #222889)
if use hppa; then
- rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont
+ rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
fi
# Support for logfile rotation
@@ -148,32 +149,30 @@
local runlevel=${2:-boot}
# if the initscript is not going to be installed and is not
# currently installed, return
- [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \
+ [[ -e ${ED}/etc/init.d/${initd} || -e ${EROOT}/etc/init.d/${initd} ]] \
|| return
- [[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return
+ [[ -e ${EROOT}/etc/runlevels/${runlevel}/${initd} ]] && return
# if runlevels dont exist just yet, then create it but still flag
# to pkg_postinst that it needs real setup #277323
- if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then
- mkdir -p "${ROOT}"/etc/runlevels/${runlevel}
- touch "${ROOT}"/etc/runlevels/.add_boot_init.created
+ if [[ ! -d ${EROOT}/etc/runlevels/${runlevel} ]] ; then
+ mkdir -p "${EROOT}"/etc/runlevels/${runlevel}
+ touch "${EROOT}"/etc/runlevels/.add_boot_init.created
fi
elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
- ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd}
+ ln -snf /etc/init.d/${initd} "${EROOT}"/etc/runlevels/${runlevel}/${initd}
}
add_boot_init_mit_config() {
local config=$1 initd=$2
- if [[ -e ${ROOT}${config} ]] ; then
- if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
+ if [[ -e ${EROOT}${config} ]] ; then
+ if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"/${config}) ]] ; then
add_boot_init ${initd}
fi
fi
}
pkg_preinst() {
- use prefix && return 0
-
local f LIBDIR=$(get_libdir)
# default net script is just comments, so no point in biting people
@@ -181,54 +180,55 @@
# manager doesnt go throwing etc-update crap at us -- postinst is
# too late to prevent that. this behavior also lets us keep the
# file in the CONTENTS for binary packages.
- [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/
+ [[ -e ${EROOT}/etc/conf.d/net ]] && \
+ cp "${EROOT}"/etc/conf.d/net "${ED}"/etc/conf.d/
# avoid default thrashing in conf.d files when possible #295406
- if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then
+ if [[ -e ${EROOT}/etc/conf.d/hostname ]] ; then
(
unset hostname HOSTNAME
- source "${ROOT}"/etc/conf.d/hostname
+ source "${EROOT}"/etc/conf.d/hostname
: ${hostname:=${HOSTNAME}}
[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
)
fi
# upgrade timezone file ... do it before moving clock
- if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
+ if [[ -e ${EROOT}/etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then
(
unset TIMEZONE
- source "${ROOT}"/etc/conf.d/clock
- [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
+ source "${EROOT}"/etc/conf.d/clock
+ [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"/etc/timezone
)
fi
# /etc/conf.d/clock moved to /etc/conf.d/hwclock
local clock
use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
- if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
- mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
+ if [[ -e ${EROOT}/etc/conf.d/clock ]] ; then
+ mv "${EROOT}"/etc/conf.d/clock "${EROOT}"/etc/conf.d/${clock}
fi
- if [[ -e ${ROOT}/etc/init.d/clock ]] ; then
- rm -f "${ROOT}"/etc/init.d/clock
+ if [[ -e ${EROOT}/etc/init.d/clock ]] ; then
+ rm -f "${EROOT}"/etc/init.d/clock
fi
- if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
- rm -f "${ROOT}"/etc/runlevels/boot/clock
- ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}
- fi
- if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
- rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock
- ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock}
+ if [[ -L ${EROOT}/etc/runlevels/boot/clock ]] ; then
+ rm -f "${EROOT}"/etc/runlevels/boot/clock
+ ln -snf /etc/init.d/${clock} "${EROOT}"/etc/runlevels/boot/${clock}
+ fi
+ if [[ -L ${EROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
+ rm -f "${EROOT}${LIBDIR}"/rc/init.d/started/clock
+ ln -snf /etc/init.d/${clock} "${EROOT}${LIBDIR}"/rc/init.d/started/${clock}
fi
# /etc/conf.d/rc is no longer used for configuration
- if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then
+ if [[ -e ${EROOT}/etc/conf.d/rc ]] ; then
elog "/etc/conf.d/rc is no longer used for configuration."
elog "Please migrate your settings to /etc/rc.conf as applicable"
elog "and delete /etc/conf.d/rc"
fi
# force net init.d scripts into symlinks
- for f in "${ROOT}"/etc/init.d/net.* ; do
+ for f in "${EROOT}"/etc/init.d/net.* ; do
[[ -e ${f} ]] || continue # catch net.* not matching anything
[[ ${f} == */net.lo ]] && continue # real file now
[[ ${f} == *.openrc.bak ]] && continue
@@ -276,7 +276,7 @@
migrate_from_baselayout_1() {
# baselayout boot init scripts have been split out
- for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
+ for f in $(cd "${ED}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
# baselayout-1 is always "old" net, so ignore "new" net
[[ ${f} == "network" ]] && continue
@@ -288,40 +288,40 @@
add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt
add_boot_init_mit_config /etc/mdadm.conf mdraid
add_boot_init_mit_config /etc/evms.conf evms
- [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper
- [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
+ [[ -e ${EROOT}/sbin/dmsetup ]] && add_boot_init device-mapper
+ [[ -e ${EROOT}/sbin/vgscan ]] && add_boot_init lvm
elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
elog "init.d scripts. If you use such a thing, make sure you have the"
elog "required init.d scripts added to your boot runlevel."
# Upgrade our state for baselayout-1 users
- if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
+ if [[ ! -e ${EROOT}${LIBDIR}/rc/init.d/started ]] ; then
(
- [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc
+ [[ -e ${EROOT}/etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc
svcdir=${svcdir:-/var/lib/init.d}
- if [[ ! -d ${ROOT}${svcdir}/started ]] ; then
+ if [[ ! -d ${EROOT}${svcdir}/started ]] ; then
ewarn "No state found, and no state exists"
elog "You should reboot this host"
else
- mkdir -p "${ROOT}${LIBDIR}/rc/init.d"
- einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d"
- mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d
- rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \
- "${ROOT}${LIBDIR}"/rc/init.d/console
- umount "${ROOT}${svcdir}" 2>/dev/null
- rm -rf "${ROOT}${svcdir}"
+ mkdir -p "${EROOT}${LIBDIR}/rc/init.d"
+ einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d"
+ mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d
+ rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \
+ "${EROOT}${LIBDIR}"/rc/init.d/console
+ umount "${EROOT}${svcdir}" 2>/dev/null
+ rm -rf "${EROOT}${svcdir}"
fi
)
fi
# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
- if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+ if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then
elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
- rm -f "${ROOT}"/etc/modules.autoload.d/.keep*
- rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
- if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+ rm -f "${EROOT}"/etc/modules.autoload.d/.keep*
+ rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null
+ if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then
local f v
- for f in "${ROOT}"/etc/modules.autoload.d/* ; do
+ for f in "${EROOT}"/etc/modules.autoload.d/* ; do
v=${f##*/}
v=${v#kernel-}
v=${v//[^[:alnum:]]/_}
@@ -342,43 +342,41 @@
print
}
END { print "\n### END: Auto-converted from " f "\n" }
- ' "${f}" >> "${D}"/etc/conf.d/modules
+ ' "${f}" >> "${ED}"/etc/conf.d/modules
done
rm -f "${f}"
- rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
+ rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null
fi
fi
}
pkg_postinst() {
- use prefix && return 0
-
local LIBDIR=$(get_libdir)
# Remove old baselayout links
- rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
- rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh
+ rm -f "${EROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
+ rm -f "${EROOT}"/etc/init.d/{depscan,runscript}.sh
# Make our runlevels if they don't exist
- if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then
+ if [[ ! -e ${EROOT}/etc/runlevels ]] || [[ -e ${EROOT}/etc/runlevels/.add_boot_init.created ]] ; then
einfo "Copying across default runlevels"
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
- rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created
+ cp -RPp "${EROOT}"/usr/share/${PN}/runlevels "${EROOT}"/etc
+ rm -f "${EROOT}"/etc/runlevels/.add_boot_init.created
else
- if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then
- mkdir -p "${ROOT}"/etc/runlevels/sysinit
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \
- "${ROOT}"/etc/runlevels/sysinit
+ if [[ ! -e ${EROOT}/etc/runlevels/sysinit/devfs ]] ; then
+ mkdir -p "${EROOT}"/etc/runlevels/sysinit
+ cp -RPp "${EROOT}"/usr/share/${PN}/runlevels/sysinit/* \
+ "${EROOT}"/etc/runlevels/sysinit
fi
- if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then
- mkdir -p "${ROOT}"/etc/runlevels/shutdown
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \
- "${ROOT}"/etc/runlevels/shutdown
+ if [[ ! -e ${EROOT}/etc/runlevels/shutdown/mount-ro ]] ; then
+ mkdir -p "${EROOT}"/etc/runlevels/shutdown
+ cp -RPp "${EROOT}"/usr/share/${PN}/runlevels/shutdown/* \
+ "${EROOT}"/etc/runlevels/shutdown
fi
fi
# /etc/conf.d/net.example is no longer valid
- local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example"
+ local NET_EXAMPLE="${EROOT}/etc/conf.d/net.example"
local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
if [[ -e "${NET_EXAMPLE}" ]] ; then
if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
@@ -388,11 +386,11 @@
sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
elog "${NET_EXAMPLE} should be removed."
fi
- elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example"
+ elog "The new file is ${EROOT}/usr/share/doc/${PF}/net.example"
fi
# /etc/conf.d/wireless.example is no longer valid
- local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example"
+ local WIRELESS_EXAMPLE="${EROOT}/etc/conf.d/wireless.example"
local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
@@ -403,11 +401,11 @@
elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
fi
elog "If you are using the old style network scripts,"
- elog "Configure wireless settings in ${ROOT}/etc/conf.d/net"
- elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example"
+ elog "Configure wireless settings in ${EROOT}/etc/conf.d/net"
+ elog "after reviewing ${EROOT}/usr/share/doc/${PF}/net.example"
fi
- if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
+ if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then
ewarn "/etc/modules.autoload.d is no longer used. Please convert"
ewarn "your files to /etc/conf.d/modules and delete the directory."
fi
@@ -419,15 +417,15 @@
fi
# Handle the conf.d/local.{start,stop} -> local.d transition
- if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then
- elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}"
- elog "files to ${ROOT}etc/local.d"
- mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start
- mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop
- chmod +x "${ROOT}"etc/local.d/*{start,stop}
+ if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+ elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+ elog "files to ${EROOT}etc/local.d"
+ mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+ mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+ chmod +x "${EROOT}"etc/local.d/*{start,stop}
fi
- if use kernel_linux && [[ "${ROOT}" = "/" ]]; then
+ if use kernel_linux && [[ "${EROOT}" = "/" ]]; 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."
@@ -435,7 +433,7 @@
fi
# update the dependency tree after touching all files #224171
- [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+ [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
elog "You should now update all files in /etc, using etc-update"
elog "or equivalent before restarting any services or this host."
1.228 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.228&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.228&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.227&r2=1.228
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- ChangeLog 27 Sep 2012 19:04:00 -0000 1.227
+++ ChangeLog 28 Sep 2012 16:32:31 -0000 1.228
@@ -1,6 +1,12 @@
# 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.227 2012/09/27 19:04:00 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.228 2012/09/28 16:32:31 williamh Exp $
+
+ 28 Sep 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Fix the ebuild so we can use pre/postinst on prefix systems as well.
+ Originally I did not think we needed this, but thinking it over it is better
+ to have them. Also this reworks the live portion of the ebuild to use a
+ separate inherit call.
27 Sep 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
Add prefix support for bug #415899. I would like to thank Benda Xu for working
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2012-09-28 22:05 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2012-09-28 22:05 UTC (permalink / raw
To: gentoo-commits
williamh 12/09/28 22:05:16
Modified: openrc-9999.ebuild ChangeLog
Log:
fix typo
(Portage version: 2.2.0_alpha134/cvs/Linux i686)
Revision Changes Path
1.107 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.106&r2=1.107
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- openrc-9999.ebuild 28 Sep 2012 21:18:26 -0000 1.106
+++ openrc-9999.ebuild 28 Sep 2012 22:05:15 -0000 1.107
@@ -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.106 2012/09/28 21:18:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.107 2012/09/28 22:05:15 williamh Exp $
EAPI=4
@@ -246,7 +246,7 @@
# swapfiles was added in 0.9.9 and needed in boot (february 2012)
has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
- if [ has_version ">=sys-apps/openrc-0.9.9" ]; then
+ if ! has_version ">=sys-apps/openrc-0.11"; then
add_boot_init sysfs sysinit
add_boot_init tmpfilesd.sysinit sysinit
add_boot_init tmpfilesd.boot boot
1.229 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.229&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.229&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.228&r2=1.229
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- ChangeLog 28 Sep 2012 16:32:31 -0000 1.228
+++ ChangeLog 28 Sep 2012 22:05:15 -0000 1.229
@@ -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.228 2012/09/28 16:32:31 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.229 2012/09/28 22:05:15 williamh Exp $
+
+ 28 Sep 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ fix typo
28 Sep 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
Fix the ebuild so we can use pre/postinst on prefix systems as well.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2012-09-29 3:15 Benda XU (heroxbd)
0 siblings, 0 replies; 24+ messages in thread
From: Benda XU (heroxbd) @ 2012-09-29 3:15 UTC (permalink / raw
To: gentoo-commits
heroxbd 12/09/29 03:15:54
Modified: openrc-9999.ebuild ChangeLog
Log:
make_args should be called only once; ED -> D in src_install to avoid double prefix. close 415899
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Revision Changes Path
1.108 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.107&r2=1.108
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- openrc-9999.ebuild 28 Sep 2012 22:05:15 -0000 1.107
+++ openrc-9999.ebuild 29 Sep 2012 03:15:54 -0000 1.108
@@ -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.107 2012/09/28 22:05:15 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.108 2012/09/29 03:15:54 heroxbd Exp $
EAPI=4
@@ -101,8 +101,8 @@
}
src_install() {
- make_args
- emake ${MAKE_ARGS} DESTDIR="${ED}" install
+ [[ -z "${MAKE_ARGS}" ]] && make_args
+ emake ${MAKE_ARGS} DESTDIR="${D}" install
# move the shared libs back to /usr so ldscript can install
# more of a minimal set of files
@@ -212,7 +212,7 @@
rm -f "${EROOT}"/etc/init.d/clock
fi
if [[ -L ${EROOT}/etc/runlevels/boot/clock ]] ; then
- rm -f "${EROOT}"/etc/runlevels/boot/clock
+ rm -f "${EROOT}"/etc/runlevels/boot/clock
ln -snf /etc/init.d/${clock} "${EROOT}"/etc/runlevels/boot/${clock}
fi
if [[ -L ${EROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
1.230 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.230&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.230&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.229&r2=1.230
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- ChangeLog 28 Sep 2012 22:05:15 -0000 1.229
+++ ChangeLog 29 Sep 2012 03:15:54 -0000 1.230
@@ -1,6 +1,10 @@
# 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.229 2012/09/28 22:05:15 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.230 2012/09/29 03:15:54 heroxbd Exp $
+
+ 29 Sep 2012; Benda Xu <heroxbd@gentoo.org> openrc-9999.ebuild:
+ make_args should be called only once; ED -> D in src_install to avoid double
+ prefix. close 415899
28 Sep 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
fix typo
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2012-09-29 20:38 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2012-09-29 20:38 UTC (permalink / raw
To: gentoo-commits
williamh 12/09/29 20:38:12
Modified: openrc-9999.ebuild ChangeLog
Log:
The code in pkg_setup and make_args is only run once at the start of src_compile, so we can move it into that function, thanks to Zac Medico for the input.
(Portage version: 2.2.0_alpha134/cvs/Linux i686)
Revision Changes Path
1.109 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.108&r2=1.109
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- openrc-9999.ebuild 29 Sep 2012 03:15:54 -0000 1.108
+++ openrc-9999.ebuild 29 Sep 2012 20:38:12 -0000 1.109
@@ -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.108 2012/09/29 03:15:54 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.109 2012/09/29 20:38:12 williamh Exp $
EAPI=4
@@ -35,7 +35,20 @@
DEPEND="${RDEPEND}
virtual/os-headers"
-make_args() {
+src_prepare() {
+ sed -i 's:0444:0644:' mk/sys.mk || die
+ sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342
+
+ if [[ ${PV} == "9999" ]] ; then
+ local ver="git-${EGIT_VERSION:0:6}"
+ sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+ fi
+
+ # Allow user patches to be applied without modifying the ebuild
+ epatch_user
+}
+
+src_compile() {
unset LIBDIR #266688
MAKE_ARGS="${MAKE_ARGS}
@@ -59,29 +72,9 @@
fi
use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet"
use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
-}
-
-pkg_setup() {
export DEBUG=$(usev debug)
export MKPAM=$(usev pam)
export MKTERMCAP=$(usev ncurses)
-}
-
-src_prepare() {
- sed -i 's:0444:0644:' mk/sys.mk || die
- sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342
-
- if [[ ${PV} == "9999" ]] ; then
- local ver="git-${EGIT_VERSION:0:6}"
- sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
- fi
-
- # Allow user patches to be applied without modifying the ebuild
- epatch_user
-}
-
-src_compile() {
- make_args
tc-export CC AR RANLIB
emake ${MAKE_ARGS}
@@ -101,7 +94,6 @@
}
src_install() {
- [[ -z "${MAKE_ARGS}" ]] && make_args
emake ${MAKE_ARGS} DESTDIR="${D}" install
# move the shared libs back to /usr so ldscript can install
1.231 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.231&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.231&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.230&r2=1.231
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- ChangeLog 29 Sep 2012 03:15:54 -0000 1.230
+++ ChangeLog 29 Sep 2012 20:38:12 -0000 1.231
@@ -1,6 +1,11 @@
# 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.230 2012/09/29 03:15:54 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.231 2012/09/29 20:38:12 williamh Exp $
+
+ 29 Sep 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ The code in pkg_setup and make_args is only run once at the start of
+ src_compile, so we can move it into that function, thanks to Zac Medico for
+ the input.
29 Sep 2012; Benda Xu <heroxbd@gentoo.org> openrc-9999.ebuild:
make_args should be called only once; ED -> D in src_install to avoid double
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2012-10-17 16:57 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2012-10-17 16:57 UTC (permalink / raw
To: gentoo-commits
williamh 12/10/17 16:57:56
Modified: openrc-9999.ebuild ChangeLog
Log:
Add a warning about adding the appropriate network script to the boot runlevel.
(Portage version: 2.2.0_alpha140/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.110 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.109&r2=1.110
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- openrc-9999.ebuild 29 Sep 2012 20:38:12 -0000 1.109
+++ openrc-9999.ebuild 17 Oct 2012 16:57:56 -0000 1.110
@@ -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.109 2012/09/29 20:38:12 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.110 2012/10/17 16:57:56 williamh Exp $
EAPI=4
@@ -433,6 +433,16 @@
# update the dependency tree after touching all files #224171
[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+ if use newnet; then
+ local netscript=network
+ else
+ local netscript=net.lo
+ fi
+
+ ewarn "Please add the $netscript script to your boot runlevel"
+ ewarn "as soon as possible. Not doing so could leave you with a system"
+ ewarn "without networking."
+
elog "You should now update all files in /etc, using etc-update"
elog "or equivalent before restarting any services or this host."
elog
1.232 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.232&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.232&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.231&r2=1.232
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- ChangeLog 29 Sep 2012 20:38:12 -0000 1.231
+++ ChangeLog 17 Oct 2012 16:57:56 -0000 1.232
@@ -1,6 +1,10 @@
# 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.231 2012/09/29 20:38:12 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.232 2012/10/17 16:57:56 williamh Exp $
+
+ 17 Oct 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Add a warning about adding the appropriate network script to the boot
+ runlevel.
29 Sep 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
The code in pkg_setup and make_args is only run once at the start of
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2012-10-18 15:03 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2012-10-18 15:03 UTC (permalink / raw
To: gentoo-commits
williamh 12/10/18 15:03:19
Modified: openrc-9999.ebuild ChangeLog
Log:
Only show warning about adding the net script to the boot runlevel if necessary.
(Portage version: 2.2.0_alpha140/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.111 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.110&r2=1.111
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- openrc-9999.ebuild 17 Oct 2012 16:57:56 -0000 1.110
+++ openrc-9999.ebuild 18 Oct 2012 15:03:19 -0000 1.111
@@ -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.110 2012/10/17 16:57:56 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.111 2012/10/18 15:03:19 williamh Exp $
EAPI=4
@@ -439,9 +439,11 @@
local netscript=net.lo
fi
- ewarn "Please add the $netscript script to your boot runlevel"
- ewarn "as soon as possible. Not doing so could leave you with a system"
- ewarn "without networking."
+ if [ ! -e "${EROOT}"/etc/runlevels/boot/${netscript} ]; then
+ ewarn "Please add the $netscript script to your boot runlevel"
+ ewarn "as soon as possible. Not doing so could leave you with a system"
+ ewarn "without networking."
+ fi
elog "You should now update all files in /etc, using etc-update"
elog "or equivalent before restarting any services or this host."
1.233 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.233&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.233&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.232&r2=1.233
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- ChangeLog 17 Oct 2012 16:57:56 -0000 1.232
+++ ChangeLog 18 Oct 2012 15:03:19 -0000 1.233
@@ -1,6 +1,10 @@
# 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.232 2012/10/17 16:57:56 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.233 2012/10/18 15:03:19 williamh Exp $
+
+ 18 Oct 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Only show warning about adding the net script to the boot runlevel if
+ necessary.
17 Oct 2012; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
Add a warning about adding the appropriate network script to the boot
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2013-04-24 5:33 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2013-04-24 5:33 UTC (permalink / raw
To: gentoo-commits
williamh 13/04/24 05:33:11
Modified: openrc-9999.ebuild ChangeLog
Log:
migrate to eapi 5 and remove old baselayout-1 migration code
(Portage version: 2.2.0_alpha173/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.120 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.119&r2=1.120
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- openrc-9999.ebuild 10 Mar 2013 20:58:26 -0000 1.119
+++ openrc-9999.ebuild 24 Apr 2013 05:33:11 -0000 1.120
@@ -1,8 +1,8 @@
# Copyright 1999-2013 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.119 2013/03/10 20:58:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.120 2013/04/24 05:33:11 williamh Exp $
-EAPI=4
+EAPI=5
inherit eutils flag-o-matic multilib pam toolchain-funcs
@@ -22,7 +22,7 @@
IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs tools
unicode kernel_linux kernel_FreeBSD"
-RDEPEND="virtual/init
+COMMON_DEPEND="virtual/init
kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
elibc_glibc? ( >=sys-libs/glibc-2.5 )
ncurses? ( sys-libs/ncurses )
@@ -35,8 +35,10 @@
selinux? ( sec-policy/selinux-openrc )
!<sys-fs/udev-init-scripts-17
!<sys-fs/udev-133"
-DEPEND="${RDEPEND}
- virtual/os-headers"
+DEPEND="${COMMON_DEPEND}
+ virtual/os-headers
+ ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}"
src_prepare() {
sed -i 's:0444:0644:' mk/sys.mk || die
@@ -56,7 +58,10 @@
MAKE_ARGS="${MAKE_ARGS}
LIBNAME=$(get_libdir)
- LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc"
+ LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+ MKSELINUX=$(usex selinux)
+ MKSTATICLIBS=$(usex static-libs)
+ MKTOOLS=$(usex tools)"
local brand="Unknown"
if use kernel_linux ; then
@@ -66,16 +71,9 @@
MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
brand="FreeBSD"
fi
- if use selinux; then
- MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes"
- fi
export BRANDING="Gentoo ${brand}"
- if ! use static-libs; then
- MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no"
- fi
use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet"
use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
- use tools && MAKE_ARGS="${MAKE_ARGS} MKTOOLS=yes"
export DEBUG=$(usev debug)
export MKPAM=$(usev pam)
export MKTERMCAP=$(usev ncurses)
@@ -189,52 +187,8 @@
)
fi
- # upgrade timezone file ... do it before moving clock
- if [[ -e ${EROOT}etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then
- (
- unset TIMEZONE
- source "${EROOT}"etc/conf.d/clock
- [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"etc/timezone
- )
- fi
-
- # /etc/conf.d/clock moved to /etc/conf.d/hwclock
- local clock
- use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
- if [[ -e "${EROOT}"etc/conf.d/clock ]] ; then
- mv "${EROOT}"etc/conf.d/clock "${EROOT}"etc/conf.d/${clock}
- fi
- if [[ -e "${EROOT}"etc/init.d/clock ]] ; then
- rm -f "${EROOT}"etc/init.d/clock
- fi
- if [[ -L "${EROOT}"etc/runlevels/boot/clock ]] ; then
- rm -f "${EROOT}"etc/runlevels/boot/clock
- ln -snf /etc/init.d/${clock} "${EROOT}"etc/runlevels/boot/${clock}
- fi
- if [[ -L "${EROOT}"${LIBDIR}/rc/init.d/started/clock ]] ; then
- rm -f "${EROOT}"${LIBDIR}/rc/init.d/started/clock
- ln -snf /etc/init.d/${clok} "${EROOT}"${LIBDIR}/rc/init.d/started/${clock}
- fi
-
- # /etc/conf.d/rc is no longer used for configuration
- if [[ -e "${EROOT}"etc/conf.d/rc ]] ; then
- elog "/etc/conf.d/rc is no longer used for configuration."
- elog "Please migrate your settings to /etc/rc.conf as applicable"
- elog "and delete /etc/conf.d/rc"
- fi
-
- # force net init.d scripts into symlinks
- for f in "${EROOT}"etc/init.d/net.* ; do
- [[ -e ${f} ]] || continue # catch net.* not matching anything
- [[ ${f} == */net.lo ]] && continue # real file now
- [[ ${f} == *.openrc.bak ]] && continue
- if [[ ! -L ${f} ]] ; then
- elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
- elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
- mv "${f}" "${f}.openrc.bak"
- ln -snf net.lo "${f}"
- fi
- done
+ # set default interactive shell to sulogin if it exists
+ set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
# termencoding was added in 0.2.1 and needed in boot
has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
@@ -246,36 +200,13 @@
add_boot_init sysfs sysinit
fi
- # set default interactive shell to sulogin if it exists
- set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
-
- has_version sys-apps/openrc || migrate_from_baselayout_1
- has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
if ! has_version ">=sys-apps/openrc-0.11.3" ; then
migrate_udev_mount_script
add_boot_init tmpfiles.setup boot
fi
-}
-# >=openrc-0.4.0 no longer loads the udev addon
-migrate_udev_init_script() {
- # make sure udev is in sysinit if it was enabled before
- local enable_udev=false
- local rc_devices=$(
- [[ -f /etc/rc.conf ]] && source /etc/rc.conf
- [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
- echo "${rc_devices:-${RC_DEVICES:-auto}}"
- )
- case ${rc_devices} in
- udev|auto)
- enable_udev=true
- ;;
- esac
-
- if $enable_udev; then
- add_boot_init udev sysinit
- add_boot_init udev-postmount default
- fi
+ # loopback was added in 0.12 and needed in boot (february 2012)
+ has_version ">=sys-apps/openrc-0.12" || add_boot_init loopback
}
# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
@@ -287,89 +218,9 @@
return 0
}
-migrate_from_baselayout_1() {
- # baselayout boot init scripts have been split out
- for f in $(cd "${ED}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
- # baselayout-1 is always "old" net, so ignore "new" net
- [[ ${f} == "network" ]] && continue
-
- add_boot_init ${f}
- done
-
- # Try to auto-add some addons when possible
- add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
- add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt
- add_boot_init_mit_config /etc/mdadm.conf mdraid
- add_boot_init_mit_config /etc/evms.conf evms
- [[ -e "${EROOT}"sbin/dmsetup ]] && add_boot_init device-mapper
- [[ -e "${EROOT}"sbin/vgscan ]] && add_boot_init lvm
- elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
- elog "init.d scripts. If you use such a thing, make sure you have the"
- elog "required init.d scripts added to your boot runlevel."
-
- # Upgrade our state for baselayout-1 users
- if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then
- (
- [[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc
- svcdir=${svcdir:-/var/lib/init.d}
- if [[ ! -d "${EROOT}"${svcdir}/started ]] ; then
- ewarn "No state found, and no state exists"
- elog "You should reboot this host"
- else
- mkdir -p "${EROOT}"${LIBDIR}/rc/init.d
- einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d"
- mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d
- rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \
- "${EROOT}${LIBDIR}"/rc/init.d/console
- umount "${EROOT}${svcdir}" 2>/dev/null
- rm -rf "${EROOT}${svcdir}"
- fi
- )
- fi
-
- # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
- if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
- elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
- rm -f "${EROOT}"etc/modules.autoload.d/.keep*
- rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null
- if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
- local f v
- for f in "${EROOT}"etc/modules.autoload.d/* ; do
- v=${f##*/}
- v=${v#kernel-}
- v=${v//[^[:alnum:]]/_}
- gawk -v v="${v}" -v f="${f##*/}" '
- BEGIN { print "\n### START: Auto-converted from " f "\n" }
- {
- if ($0 ~ /^[^#]/) {
- print "modules_" v "=\"${modules_" v "} " $1 "\""
- gsub(/[^[:alnum:]]/, "_", $1)
- printf "module_" $1 "_args_" v "=\""
- for (i = 2; i <= NF; ++i) {
- if (i > 2)
- printf " "
- printf $i
- }
- print "\"\n"
- } else
- print
- }
- END { print "\n### END: Auto-converted from " f "\n" }
- ' "${f}" >> "${ED}"/etc/conf.d/modules
- done
- rm -f "${f}"
- rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null
- fi
- fi
-}
-
pkg_postinst() {
local LIBDIR=$(get_libdir)
- # Remove old baselayout links
- rm -f "${EROOT}"etc/runlevels/boot/{check{fs,root},rmnologin}
- rm -f "${EROOT}"etc/init.d/{depscan,runscript}.sh
-
# Make our runlevels if they don't exist
if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
einfo "Copying across default runlevels"
@@ -388,41 +239,6 @@
fi
fi
- # /etc/conf.d/net.example is no longer valid
- local NET_EXAMPLE="${EROOT}etc/conf.d/net.example"
- local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
- if [[ -e "${NET_EXAMPLE}" ]] ; then
- if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
- rm -f "${NET_EXAMPLE}"
- elog "${NET_EXAMPLE} has been removed."
- else
- sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
- elog "${NET_EXAMPLE} should be removed."
- fi
- elog "The new file is ${EROOT}usr/share/doc/${PF}/net.example"
- fi
-
- # /etc/conf.d/wireless.example is no longer valid
- local WIRELESS_EXAMPLE="${EROOT}etc/conf.d/wireless.example"
- local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
- if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
- if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
- rm -f "${WIRELESS_EXAMPLE}"
- elog "${WIRELESS_EXAMPLE} is deprecated and has been removed."
- else
- sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}"
- elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
- fi
- elog "If you are using the old style network scripts,"
- elog "Configure wireless settings in ${EROOT}etc/conf.d/net"
- elog "after reviewing ${EROOT}usr/share/doc/${PF}/net.example"
- fi
-
- if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then
- ewarn "/etc/modules.autoload.d is no longer used. Please convert"
- ewarn "your files to /etc/conf.d/modules and delete the directory."
- fi
-
if use hppa; then
elog "Setting the console font does not work on all HPPA consoles."
elog "You can still enable it by running:"
1.267 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.267&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.267&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.266&r2=1.267
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- ChangeLog 3 Mar 2013 03:46:42 -0000 1.266
+++ ChangeLog 24 Apr 2013 05:33:11 -0000 1.267
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.266 2013/03/03 03:46:42 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.267 2013/04/24 05:33:11 williamh Exp $
+
+ 24 Apr 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ migrate to eapi 5 and remove old baselayout-1 migration code
03 Mar 2013; William Hubbs <williamh@gentoo.org> openrc-0.11.8.ebuild:
Per Mike Frysinger, on bug #459782, we should not rdepend on ncurses[-tinfo].
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2013-04-25 21:04 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2013-04-25 21:04 UTC (permalink / raw
To: gentoo-commits
williamh 13/04/25 21:04:45
Modified: openrc-9999.ebuild ChangeLog
Log:
change git source to point to github
(Portage version: 2.2.0_alpha173/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.121 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.120&r2=1.121
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- openrc-9999.ebuild 24 Apr 2013 05:33:11 -0000 1.120
+++ openrc-9999.ebuild 25 Apr 2013 21:04:45 -0000 1.121
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.120 2013/04/24 05:33:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.121 2013/04/25 21:04:45 williamh Exp $
EAPI=5
@@ -10,7 +10,7 @@
HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
+ EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git"
inherit git-2
else
SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
1.268 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.268&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.268&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.267&r2=1.268
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- ChangeLog 24 Apr 2013 05:33:11 -0000 1.267
+++ ChangeLog 25 Apr 2013 21:04:45 -0000 1.268
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.267 2013/04/24 05:33:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.268 2013/04/25 21:04:45 williamh Exp $
+
+ 25 Apr 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ change git source to point to github
24 Apr 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
migrate to eapi 5 and remove old baselayout-1 migration code
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2013-08-05 20:19 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2013-08-05 20:19 UTC (permalink / raw
To: gentoo-commits
williamh 13/08/05 20:19:21
Modified: openrc-9999.ebuild ChangeLog
Log:
Install the documention for incompatibilities with busybox, and optionally, the documentation for the newnet scripts.
(Portage version: 2.2.0_alpha194/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.123 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.123&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.123&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.122&r2=1.123
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- openrc-9999.ebuild 26 Jul 2013 02:05:21 -0000 1.122
+++ openrc-9999.ebuild 5 Aug 2013 20:19:21 -0000 1.123
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.122 2013/07/26 02:05:21 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.123 2013/08/05 20:19:21 williamh Exp $
EAPI=5
@@ -136,6 +136,12 @@
# install the gentoo pam.d file
newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+
+ # install documentation
+dodoc README.busybox
+ if use newnet; then
+ dodoc README.net
+ fi
}
add_boot_init() {
1.269 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.269&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.269&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.268&r2=1.269
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- ChangeLog 25 Apr 2013 21:04:45 -0000 1.268
+++ ChangeLog 5 Aug 2013 20:19:21 -0000 1.269
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.268 2013/04/25 21:04:45 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.269 2013/08/05 20:19:21 williamh Exp $
+
+ 05 Aug 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Install the documention for incompatibilities with busybox, and optionally,
+ the documentation for the newnet scripts.
25 Apr 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
change git source to point to github
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2013-08-16 17:39 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2013-08-16 17:39 UTC (permalink / raw
To: gentoo-commits
williamh 13/08/16 17:39:21
Modified: openrc-9999.ebuild ChangeLog
Log:
partially sync live ebuild
(Portage version: 2.2.0/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.127 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.126&r2=1.127
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- openrc-9999.ebuild 14 Aug 2013 03:56:38 -0000 1.126
+++ openrc-9999.ebuild 16 Aug 2013 17:39:21 -0000 1.127
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.126 2013/08/14 03:56:38 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.127 2013/08/16 17:39:21 williamh Exp $
EAPI=5
@@ -139,9 +139,9 @@
newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
# install documentation
-dodoc README.busybox
+ dodoc README.busybox
if use newnet; then
- dodoc README.net
+ dodoc README.newnet
fi
}
@@ -269,11 +269,11 @@
if ! use newnet && ! use netifrc; then
ewarn "You have emerged OpenRc without network support. This"
ewarn "means you need to SET UP a network manager such as"
- ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
- ewarn "net-misc/NetworkManager, or net-misc/badvpn."
- ewarn "Or, you have the option of emerging openrc with the newnet"
- ewarn "use flag and configuring /etc/conf.d/network and"
- ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+ ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+ ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+ ewarn "Or, you have the option of emerging openrc with the newnet"
+ ewarn "use flag and configuring /etc/conf.d/network and"
+ ewarn "/etc/conf.d/staticroute if you only use static interfaces."
fi
if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
1.276 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.276&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.276&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.275&r2=1.276
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- ChangeLog 16 Aug 2013 16:13:14 -0000 1.275
+++ ChangeLog 16 Aug 2013 17:39:21 -0000 1.276
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.275 2013/08/16 16:13:14 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.276 2013/08/16 17:39:21 williamh Exp $
+
+ 16 Aug 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ partially sync live ebuild
16 Aug 2013; Ian Stakenvicius <axs@gentoo.org> +files/net.confd.comment,
openrc-0.12.ebuild:
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2013-08-16 18:19 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2013-08-16 18:19 UTC (permalink / raw
To: gentoo-commits
williamh 13/08/16 18:19:03
Modified: openrc-9999.ebuild ChangeLog
Log:
sync live ebuild
(Portage version: 2.2.0/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.128 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.128&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.128&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.127&r2=1.128
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- openrc-9999.ebuild 16 Aug 2013 17:39:21 -0000 1.127
+++ openrc-9999.ebuild 16 Aug 2013 18:19:03 -0000 1.128
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.127 2013/08/16 17:39:21 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.128 2013/08/16 18:19:03 williamh Exp $
EAPI=5
@@ -208,6 +208,21 @@
if ! has_version ">=sys-apps/openrc-0.12"; then
add_boot_init loopback
add_boot_init tmpfiles.dev sysinit
+
+ # ensure existing /etc/conf.d/net is not removed
+ # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+ # this needs to stay in openrc ebuilds for a long time. :(
+ # Added in 0.12.
+ if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+ einfo "Modifying conf.d/net to keep it from being removed"
+ cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment. Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+ fi
fi
}
1.278 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.278&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.278&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.277&r2=1.278
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -r1.277 -r1.278
--- ChangeLog 16 Aug 2013 18:12:50 -0000 1.277
+++ ChangeLog 16 Aug 2013 18:19:03 -0000 1.278
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.277 2013/08/16 18:12:50 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.278 2013/08/16 18:19:03 williamh Exp $
+
+ 16 Aug 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ sync live ebuild
16 Aug 2013; William Hubbs <williamh@gentoo.org> -files/net.confd.comment,
openrc-0.12.ebuild:
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2013-09-27 16:11 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2013-09-27 16:11 UTC (permalink / raw
To: gentoo-commits
williamh 13/09/27 16:11:46
Modified: openrc-9999.ebuild ChangeLog
Log:
remove references to libeinfo since it no longer exists upstream
(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.130 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.130&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.130&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.129&r2=1.130
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- openrc-9999.ebuild 16 Sep 2013 20:47:10 -0000 1.129
+++ openrc-9999.ebuild 27 Sep 2013 16:11:46 -0000 1.130
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.129 2013/09/16 20:47:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.130 2013/09/27 16:11:46 williamh Exp $
EAPI=5
@@ -106,8 +106,7 @@
# more of a minimal set of files
# disabled for now due to #270646
#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
- #gen_usr_ldscript -a einfo rc
- gen_usr_ldscript libeinfo.so
+ #gen_usr_ldscript -a rc
gen_usr_ldscript librc.so
if ! use kernel_linux; then
1.280 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.280&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.280&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.279&r2=1.280
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- ChangeLog 16 Aug 2013 20:31:21 -0000 1.279
+++ ChangeLog 27 Sep 2013 16:11:46 -0000 1.280
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.279 2013/08/16 20:31:21 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.280 2013/09/27 16:11:46 williamh Exp $
+
+ 27 Sep 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ remove references to libeinfo since it no longer exists upstream
16 Aug 2013; Ian Stakenvicius <axs@gentoo.org> openrc-0.11.8.ebuild:
added blocker on net-misc/netifrc to openrc-0.11.8 just in case it helps
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2013-10-21 19:03 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2013-10-21 19:03 UTC (permalink / raw
To: gentoo-commits
williamh 13/10/21 19:03:34
Modified: openrc-9999.ebuild ChangeLog
Log:
bring back gen_usr_ldscript calls for libeinfo
(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.131 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.131&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.131&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.130&r2=1.131
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- openrc-9999.ebuild 27 Sep 2013 16:11:46 -0000 1.130
+++ openrc-9999.ebuild 21 Oct 2013 19:03:34 -0000 1.131
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.130 2013/09/27 16:11:46 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.131 2013/10/21 19:03:34 williamh Exp $
EAPI=5
@@ -106,7 +106,8 @@
# more of a minimal set of files
# disabled for now due to #270646
#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
- #gen_usr_ldscript -a rc
+ #gen_usr_ldscript -a einfo rc
+ gen_usr_ldscript libeinfo.so
gen_usr_ldscript librc.so
if ! use kernel_linux; then
1.285 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.285&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.285&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.284&r2=1.285
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- ChangeLog 21 Oct 2013 18:44:22 -0000 1.284
+++ ChangeLog 21 Oct 2013 19:03:34 -0000 1.285
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.284 2013/10/21 18:44:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.285 2013/10/21 19:03:34 williamh Exp $
+
+ 21 Oct 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ bring back gen_usr_ldscript calls for libeinfo
21 Oct 2013; William Hubbs <williamh@gentoo.org> -openrc-0.12.1.ebuild,
-openrc-0.12.ebuild:
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2013-12-21 19:58 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2013-12-21 19:58 UTC (permalink / raw
To: gentoo-commits
williamh 13/12/21 19:58:00
Modified: openrc-9999.ebuild ChangeLog
Log:
Fix the mknet setting. It is either yes or no, so we can use usex.
(Portage version: 2.2.7/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.132 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.131&r2=1.132
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- openrc-9999.ebuild 21 Oct 2013 19:03:34 -0000 1.131
+++ openrc-9999.ebuild 21 Dec 2013 19:58:00 -0000 1.132
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.131 2013/10/21 19:03:34 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.132 2013/12/21 19:58:00 williamh Exp $
EAPI=5
@@ -63,6 +63,7 @@
MAKE_ARGS="${MAKE_ARGS}
LIBNAME=$(get_libdir)
LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+ MKNET=$(usex newnet)
MKSELINUX=$(usex selinux)
MKSTATICLIBS=$(usex static-libs)
MKTOOLS=$(usex tools)"
@@ -76,7 +77,6 @@
brand="FreeBSD"
fi
export BRANDING="Gentoo ${brand}"
- use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet"
use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
export DEBUG=$(usev debug)
export MKPAM=$(usev pam)
1.292 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.292&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.292&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.291&r2=1.292
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- ChangeLog 29 Nov 2013 18:02:55 -0000 1.291
+++ ChangeLog 21 Dec 2013 19:58:00 -0000 1.292
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.291 2013/11/29 18:02:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.292 2013/12/21 19:58:00 williamh Exp $
+
+ 21 Dec 2013; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Fix the mknet setting. It is either yes or no, so we can use usex.
29 Nov 2013; Johannes Huber <johu@gentoo.org> openrc-0.12.4.ebuild:
x86 stable wrt bug #487332
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2014-07-16 18:21 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2014-07-16 18:21 UTC (permalink / raw
To: gentoo-commits
williamh 14/07/16 18:21:13
Modified: openrc-9999.ebuild ChangeLog
Log:
add sys-libs/libselinux to dependencies for bug #516956
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.134 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.133&r2=1.134
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- openrc-9999.ebuild 18 Jan 2014 09:10:41 -0000 1.133
+++ openrc-9999.ebuild 16 Jul 2014 18:21:13 -0000 1.134
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.133 2014/01/18 09:10:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.134 2014/07/16 18:21:13 williamh Exp $
EAPI=5
@@ -31,7 +31,7 @@
kernel_linux? (
sys-process/psmisc
)
- selinux? ( sec-policy/selinux-openrc )
+ selinux? ( sec-policy/selinux-openrc sys-libs/libselinux )
!<sys-fs/udev-init-scripts-17
!<sys-fs/udev-133"
DEPEND="${COMMON_DEPEND}
1.301 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.301&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.301&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.300&r2=1.301
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- ChangeLog 6 Mar 2014 02:19:34 -0000 1.300
+++ ChangeLog 16 Jul 2014 18:21:13 -0000 1.301
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.300 2014/03/06 02:19:34 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.301 2014/07/16 18:21:13 williamh Exp $
+
+ 16 Jul 2014; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ add sys-libs/libselinux to dependencies for bug #516956
06 Mar 2014; William Hubbs <williamh@gentoo.org> -openrc-0.11.8.ebuild:
remove old version
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2014-08-11 19:10 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2014-08-11 19:10 UTC (permalink / raw
To: gentoo-commits
williamh 14/08/11 19:10:06
Modified: openrc-9999.ebuild ChangeLog
Log:
Install README and README.history
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.135 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.134&r2=1.135
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- openrc-9999.ebuild 16 Jul 2014 18:21:13 -0000 1.134
+++ openrc-9999.ebuild 11 Aug 2014 19:10:06 -0000 1.135
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.134 2014/07/16 18:21:13 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.135 2014/08/11 19:10:06 williamh Exp $
EAPI=5
@@ -139,7 +139,7 @@
newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
# install documentation
- dodoc README.busybox
+ dodoc README README.busybox README.history
if use newnet; then
dodoc README.newnet
fi
1.302 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.302&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.302&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.301&r2=1.302
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- ChangeLog 16 Jul 2014 18:21:13 -0000 1.301
+++ ChangeLog 11 Aug 2014 19:10:06 -0000 1.302
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.301 2014/07/16 18:21:13 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.302 2014/08/11 19:10:06 williamh Exp $
+
+ 11 Aug 2014; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Install README and README.history
16 Jul 2014; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
add sys-libs/libselinux to dependencies for bug #516956
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2014-08-12 1:22 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2014-08-12 1:22 UTC (permalink / raw
To: gentoo-commits
williamh 14/08/12 01:22:44
Modified: openrc-9999.ebuild ChangeLog
Log:
install feature removal schedule
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.136 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.136&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.136&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.135&r2=1.136
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- openrc-9999.ebuild 11 Aug 2014 19:10:06 -0000 1.135
+++ openrc-9999.ebuild 12 Aug 2014 01:22:44 -0000 1.136
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.135 2014/08/11 19:10:06 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.136 2014/08/12 01:22:44 williamh Exp $
EAPI=5
@@ -31,7 +31,9 @@
kernel_linux? (
sys-process/psmisc
)
- selinux? ( sec-policy/selinux-openrc sys-libs/libselinux )
+ selinux? ( sec-policy/selinux-base-policy
+ sec-policy/selinux-openrc
+ sys-libs/libselinux )
!<sys-fs/udev-init-scripts-17
!<sys-fs/udev-133"
DEPEND="${COMMON_DEPEND}
@@ -139,7 +141,7 @@
newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
# install documentation
- dodoc README README.busybox README.history
+ dodoc README README.busybox README.history FEATURE-REMOVAL-SCHEDULE
if use newnet; then
dodoc README.newnet
fi
1.303 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.303&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.303&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.302&r2=1.303
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- ChangeLog 11 Aug 2014 19:10:06 -0000 1.302
+++ ChangeLog 12 Aug 2014 01:22:44 -0000 1.303
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.302 2014/08/11 19:10:06 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.303 2014/08/12 01:22:44 williamh Exp $
+
+ 12 Aug 2014; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ install feature removal schedule
11 Aug 2014; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
Install README and README.history
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2014-08-22 20:17 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2014-08-22 20:17 UTC (permalink / raw
To: gentoo-commits
williamh 14/08/22 20:17:35
Modified: openrc-9999.ebuild ChangeLog
Log:
sync live ebuild
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.138 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.138&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.137&r2=1.138
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- openrc-9999.ebuild 20 Aug 2014 15:34:21 -0000 1.137
+++ openrc-9999.ebuild 22 Aug 2014 20:17:35 -0000 1.138
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.137 2014/08/20 15:34:21 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.138 2014/08/22 20:17:35 williamh Exp $
EAPI=5
@@ -35,8 +35,7 @@
selinux? ( sec-policy/selinux-base-policy
sec-policy/selinux-openrc
sys-libs/libselinux )
- !<sys-fs/udev-init-scripts-17
- !<sys-fs/udev-133"
+ !<sys-fs/udev-init-scripts-27"
DEPEND="${COMMON_DEPEND}
virtual/os-headers
ncurses? ( virtual/pkgconfig )"
1.308 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.308&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.308&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.307&r2=1.308
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- ChangeLog 22 Aug 2014 20:07:51 -0000 1.307
+++ ChangeLog 22 Aug 2014 20:17:35 -0000 1.308
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.307 2014/08/22 20:07:51 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.308 2014/08/22 20:17:35 williamh Exp $
+
+ 22 Aug 2014; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ sync live ebuild
22 Aug 2014; William Hubbs <williamh@gentoo.org> -openrc-0.13.ebuild:
remove broken version
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2014-12-05 21:00 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2014-12-05 21:00 UTC (permalink / raw
To: gentoo-commits
williamh 14/12/05 21:00:53
Modified: openrc-9999.ebuild ChangeLog
Log:
Change reference from git.mk to gitver.mk to match upstream
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.142 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.141&r2=1.142
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- openrc-9999.ebuild 2 Nov 2014 09:54:49 -0000 1.141
+++ openrc-9999.ebuild 5 Dec 2014 21:00:53 -0000 1.142
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.141 2014/11/02 09:54:49 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.142 2014/12/05 21:00:53 williamh Exp $
EAPI=5
@@ -59,7 +59,7 @@
if [[ ${PV} == "9999" ]] ; then
local ver="git-${EGIT_VERSION:0:6}"
- sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
+ sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
fi
# Allow user patches to be applied without modifying the ebuild
1.317 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.317&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.317&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.316&r2=1.317
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -r1.316 -r1.317
--- ChangeLog 24 Nov 2014 04:51:58 -0000 1.316
+++ ChangeLog 5 Dec 2014 21:00:53 -0000 1.317
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.316 2014/11/24 04:51:58 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.317 2014/12/05 21:00:53 williamh Exp $
+
+ 05 Dec 2014; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Change reference from git.mk to gitver.mk to match upstream
*openrc-0.13.6 (24 Nov 2014)
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2015-04-22 23:01 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2015-04-22 23:01 UTC (permalink / raw
To: gentoo-commits
williamh 15/04/22 23:01:27
Modified: openrc-9999.ebuild ChangeLog
Log:
Most upstream documentation is now in markdown, so adjust the ebuild to install it.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.144 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.144&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.143&r2=1.144
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- openrc-9999.ebuild 26 Feb 2015 18:59:35 -0000 1.143
+++ openrc-9999.ebuild 22 Apr 2015 23:01:27 -0000 1.144
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.143 2015/02/26 18:59:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.144 2015/04/22 23:01:27 williamh Exp $
EAPI=5
@@ -152,7 +152,7 @@
newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
# install documentation
- dodoc README README.busybox README.history FEATURE-REMOVAL-SCHEDULE
+ dodoc *.md
if use newnet; then
dodoc README.newnet
fi
1.337 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.337&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.337&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.336&r2=1.337
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- ChangeLog 26 Feb 2015 18:59:35 -0000 1.336
+++ ChangeLog 22 Apr 2015 23:01:27 -0000 1.337
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.336 2015/02/26 18:59:35 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.337 2015/04/22 23:01:27 williamh Exp $
+
+ 22 Apr 2015; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Most upstream documentation is now in markdown, so adjust the ebuild to
+ install it.
26 Feb 2015; William Hubbs <williamh@gentoo.org> openrc-0.13.11.ebuild,
openrc-9999.ebuild:
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog
@ 2015-04-25 1:18 William Hubbs (williamh)
0 siblings, 0 replies; 24+ messages in thread
From: William Hubbs (williamh) @ 2015-04-25 1:18 UTC (permalink / raw
To: gentoo-commits
williamh 15/04/25 01:18:57
Modified: openrc-9999.ebuild ChangeLog
Log:
Add binfmt automatically to the boot runlevel when upgrading from <0.14
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.145 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.144&r2=1.145
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- openrc-9999.ebuild 22 Apr 2015 23:01:27 -0000 1.144
+++ openrc-9999.ebuild 25 Apr 2015 01:18:57 -0000 1.145
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.144 2015/04/22 23:01:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.145 2015/04/25 01:18:57 williamh Exp $
EAPI=5
@@ -237,6 +237,7 @@
EOF
fi
fi
+ has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
}
# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
1.338 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.338&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.338&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.337&r2=1.338
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- ChangeLog 22 Apr 2015 23:01:27 -0000 1.337
+++ ChangeLog 25 Apr 2015 01:18:57 -0000 1.338
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.337 2015/04/22 23:01:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.338 2015/04/25 01:18:57 williamh Exp $
+
+ 25 Apr 2015; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Add binfmt automatically to the boot runlevel when upgrading from <0.14
22 Apr 2015; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
Most upstream documentation is now in markdown, so adjust the ebuild to
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2015-04-25 1:19 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-28 22:05 [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog William Hubbs (williamh)
-- strict thread matches above, loose matches on Subject: below --
2015-04-25 1:18 William Hubbs (williamh)
2015-04-22 23:01 William Hubbs (williamh)
2014-12-05 21:00 William Hubbs (williamh)
2014-08-22 20:17 William Hubbs (williamh)
2014-08-12 1:22 William Hubbs (williamh)
2014-08-11 19:10 William Hubbs (williamh)
2014-07-16 18:21 William Hubbs (williamh)
2013-12-21 19:58 William Hubbs (williamh)
2013-10-21 19:03 William Hubbs (williamh)
2013-09-27 16:11 William Hubbs (williamh)
2013-08-16 18:19 William Hubbs (williamh)
2013-08-16 17:39 William Hubbs (williamh)
2013-08-05 20:19 William Hubbs (williamh)
2013-04-25 21:04 William Hubbs (williamh)
2013-04-24 5:33 William Hubbs (williamh)
2012-10-18 15:03 William Hubbs (williamh)
2012-10-17 16:57 William Hubbs (williamh)
2012-09-29 20:38 William Hubbs (williamh)
2012-09-29 3:15 Benda XU (heroxbd)
2012-09-28 16:32 William Hubbs (williamh)
2012-09-27 19:04 William Hubbs (williamh)
2012-05-16 20:57 William Hubbs (williamh)
2012-02-13 15:31 William Hubbs (williamh)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox