public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-24 21:58 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-24 21:58 UTC (permalink / raw
  To: gentoo-commits

vapier      08/03/24 21:58:30

  Modified:             openrc-9999.ebuild
  Log:
  handle module arguments
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.5                  sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.4&r2=1.5

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openrc-9999.ebuild	24 Mar 2008 07:30:18 -0000	1.4
+++ openrc-9999.ebuild	24 Mar 2008 21:58:30 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4 2008/03/24 07:30:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.5 2008/03/24 21:58:30 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -135,13 +135,24 @@
 				v=${f##*/}
 				v=${v#kernel-}
 				v=${v//[^[:alnum:]]/_}
-				(
-				printf "\n### START: Auto-converted from ${f##*/}\n\n"
-				sed \
-					-e "/^[^#]/s:^\(.*\)$:modules_${v}=\"\${modules_${v}} \1\":" \
-					"${f}"
-				printf "\n### END: Auto-converted from ${f##*/}\n\n"
-				) >> "${D}"/etc/conf.d/modules
+				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=\""
+						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}" >> "${D}"/etc/conf.d/modules
 				rm -f "${f}"
 			done
 			rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2013-09-16 20:47 William Hubbs (williamh)
  0 siblings, 0 replies; 19+ messages in thread
From: William Hubbs (williamh) @ 2013-09-16 20:47 UTC (permalink / raw
  To: gentoo-commits

williamh    13/09/16 20:47:10

  Modified:             openrc-9999.ebuild
  Log:
  Migrate to git-r3 eclass
  
  (Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 0x30C46538)

Revision  Changes    Path
1.129                sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.128&r2=1.129

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- openrc-9999.ebuild	16 Aug 2013 18:19:03 -0000	1.128
+++ openrc-9999.ebuild	16 Sep 2013 20:47:10 -0000	1.129
@@ -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.128 2013/08/16 18:19:03 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.129 2013/09/16 20:47:10 williamh Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"





^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2013-07-26  2:05 William Hubbs (williamh)
  0 siblings, 0 replies; 19+ messages in thread
From: William Hubbs (williamh) @ 2013-07-26  2:05 UTC (permalink / raw
  To: gentoo-commits

williamh    13/07/26 02:05:21

  Modified:             openrc-9999.ebuild
  Log:
  Add tmpfiles.dev to the boot runlevel and remove the note referring to the migration guide since we no longer support migration from baselayout-1.x.
  
  (Portage version: 2.2.0_alpha188/cvs/Linux i686, signed Manifest commit with key 0x30C46538)

Revision  Changes    Path
1.122                sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.122&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.122&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.121&r2=1.122

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- openrc-9999.ebuild	25 Apr 2013 21:04:45 -0000	1.121
+++ openrc-9999.ebuild	26 Jul 2013 02:05:21 -0000	1.122
@@ -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.121 2013/04/25 21:04:45 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.122 2013/07/26 02:05:21 williamh Exp $
 
 EAPI=5
 
@@ -205,8 +205,11 @@
 		add_boot_init tmpfiles.setup boot
 	fi
 
-	# loopback was added in 0.12 and needed in boot (february 2012)
-	has_version ">=sys-apps/openrc-0.12" || add_boot_init loopback
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+	fi
 }
 
 # >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
@@ -294,7 +297,4 @@
 
 	elog "You should now update all files in /etc, using etc-update"
 	elog "or equivalent before restarting any services or this host."
-	elog
-	elog "Please read the migration guide available at:"
-	elog "http://www.gentoo.org/doc/en/openrc-migration.xml"
 }





^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2012-11-07 14:59 William Hubbs (williamh)
  0 siblings, 0 replies; 19+ messages in thread
From: William Hubbs (williamh) @ 2012-11-07 14:59 UTC (permalink / raw
  To: gentoo-commits

williamh    12/11/07 14:59:23

  Modified:             openrc-9999.ebuild
  Log:
  Fix references to $EROOT and $ED. References to $EROOT should be quoted and not followed with /. References to $ED should be quoted.
  
  (Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 0x30C46538)

Revision  Changes    Path
1.115                sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.114&r2=1.115

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- openrc-9999.ebuild	31 Oct 2012 23:43:01 -0000	1.114
+++ openrc-9999.ebuild	7 Nov 2012 14:59:23 -0000	1.115
@@ -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.114 2012/10/31 23:43:01 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.115 2012/11/07 14:59:23 williamh Exp $
 
 EAPI=4
 
@@ -141,24 +141,24 @@
 	local runlevel=${2:-boot}
 	# if the initscript is not going to be installed and is not
 	# currently installed, return
-	[[ -e ${ED}/etc/init.d/${initd} || -e ${EROOT}/etc/init.d/${initd} ]] \
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
 		|| return
-	[[ -e ${EROOT}/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 ${EROOT}/etc/runlevels/${runlevel} ]] ; then
-		mkdir -p "${EROOT}"/etc/runlevels/${runlevel}
-		touch "${EROOT}"/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 "${EROOT}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/${runlevel}/${initd}
+	ln -snf "${EROOT}"etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
 }
 add_boot_init_mit_config() {
 	local config=$1 initd=$2
 	if [[ -e ${EROOT}${config} ]] ; then
-		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"/${config}) ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
 			add_boot_init ${initd}
 		fi
 	fi
@@ -172,55 +172,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 ${EROOT}/etc/conf.d/net ]] && \
-		cp "${EROOT}"/etc/conf.d/net "${ED}"/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 ${EROOT}/etc/conf.d/hostname ]] ; then
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
 		(
 		unset hostname HOSTNAME
-		source "${EROOT}"/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 ${EROOT}/etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then
+	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
+		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}
+	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
+	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/${clock} "${EROOT}${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/${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
+	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
+	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,8 +276,8 @@
 
 # >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
 migrate_udev_mount_script() {
-	if [ -e "${EROOT}"/etc/runlevels/sysinit/udev -a \
-		! -e "${EROOT}"/etc/runlevels/sysinit/udev-mount ]; then
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
 		add_boot_init udev-mount sysinit
 	fi
 	return 0
@@ -297,22 +297,22 @@
 	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
+	[[ -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
+	if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then
 		(
-		[[ -e ${EROOT}/etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc
+		[[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc
 		svcdir=${svcdir:-/var/lib/init.d}
-		if [[ ! -d ${EROOT}${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 "${EROOT}${LIBDIR}/rc/init.d"
+			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 \
@@ -324,13 +324,13 @@
 	fi
 
 	# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
-	if [[ -d ${EROOT}/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 "${EROOT}"/etc/modules.autoload.d/.keep*
-		rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null
-		if [[ -d ${EROOT}/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 "${EROOT}"/etc/modules.autoload.d/* ; do
+			for f in "${EROOT}"etc/modules.autoload.d/* ; do
 				v=${f##*/}
 				v=${v#kernel-}
 				v=${v//[^[:alnum:]]/_}
@@ -354,7 +354,7 @@
 				' "${f}" >> "${ED}"/etc/conf.d/modules
 			done
 				rm -f "${f}"
-			rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null
+			rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null
 		fi
 	fi
 }
@@ -363,29 +363,29 @@
 	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
+	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
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
 		einfo "Copying across default runlevels"
-		cp -RPp "${EROOT}"/usr/share/${PN}/runlevels "${EROOT}"/etc
-		rm -f "${EROOT}"/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 ${EROOT}/etc/runlevels/sysinit/devfs ]] ; then
-			mkdir -p "${EROOT}"/etc/runlevels/sysinit
-			cp -RPp "${EROOT}"/usr/share/${PN}/runlevels/sysinit/* \
-				"${EROOT}"/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 ${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
+		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="${EROOT}/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
@@ -395,11 +395,11 @@
 			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"
+		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_EXAMPLE="${EROOT}etc/conf.d/wireless.example"
 	local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
 	if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
 		if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
@@ -410,11 +410,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 ${EROOT}/etc/conf.d/net"
-		elog "after reviewing ${EROOT}/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 ${EROOT}/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
@@ -450,7 +450,7 @@
 		local netscript=net.lo
 	fi
 
-	if [ ! -e "${EROOT}"/etc/runlevels/boot/${netscript} ]; then
+	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."
@@ -460,7 +460,7 @@
 	ewarn "satisfies the net virtual."
 	ewarn "If you have services now which do not start because of this,"
 	ewarn "They can be fixed by adding rc_need=\"!net\""
-	ewarn "to the ${EROOT}/etc/conf.d/<servicename> file."
+	ewarn "to the ${EROOT}etc/conf.d/<servicename> file."
 	ewarn "You should also file a bug against the service asking that"
 	ewarn "need net be dropped from the dependencies."
 	ewarn "The bug you file should block the following tracker:"





^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2012-10-31 23:43 William Hubbs (williamh)
  0 siblings, 0 replies; 19+ messages in thread
From: William Hubbs (williamh) @ 2012-10-31 23:43 UTC (permalink / raw
  To: gentoo-commits

williamh    12/10/31 23:43:01

  Modified:             openrc-9999.ebuild
  Log:
  consolidate the scripts to add to the runlevels for >=openrc-0.11.3
  
  (Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 0x30C46538)

Revision  Changes    Path
1.114                sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.114&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.114&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.113&r2=1.114

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- openrc-9999.ebuild	31 Oct 2012 22:47:31 -0000	1.113
+++ openrc-9999.ebuild	31 Oct 2012 23:43:01 -0000	1.114
@@ -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.113 2012/10/31 22:47:31 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.114 2012/10/31 23:43:01 williamh Exp $
 
 EAPI=4
 
@@ -240,7 +240,6 @@
 
 	if ! has_version ">=sys-apps/openrc-0.11"; then
 		add_boot_init sysfs sysinit
-		add_boot_init tmpfiles.setup boot
 	fi
 
 	# set default interactive shell to sulogin if it exists
@@ -248,7 +247,10 @@
 
 	has_version sys-apps/openrc || migrate_from_baselayout_1
 	has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
-	has_version ">=sys-apps/openrc-0.11.3" || migrate_udev_mount_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





^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2012-10-31 22:47 William Hubbs (williamh)
  0 siblings, 0 replies; 19+ messages in thread
From: William Hubbs (williamh) @ 2012-10-31 22:47 UTC (permalink / raw
  To: gentoo-commits

williamh    12/10/31 22:47:31

  Modified:             openrc-9999.ebuild
  Log:
  Add tmpfiles.setup to the boot runlevel and udev-mount to the sysinit runlevel.
  
  (Portage version: 2.2.0_alpha142/cvs/Linux i686, signed Manifest commit with key 0x30C46538)

Revision  Changes    Path
1.113                sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.112&r2=1.113

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- openrc-9999.ebuild	31 Oct 2012 17:39:52 -0000	1.112
+++ openrc-9999.ebuild	31 Oct 2012 22:47:31 -0000	1.113
@@ -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.112 2012/10/31 17:39:52 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.113 2012/10/31 22:47:31 williamh Exp $
 
 EAPI=4
 
@@ -240,8 +240,7 @@
 
 	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
+		add_boot_init tmpfiles.setup boot
 	fi
 
 	# set default interactive shell to sulogin if it exists
@@ -249,6 +248,7 @@
 
 	has_version sys-apps/openrc || migrate_from_baselayout_1
 	has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
+	has_version ">=sys-apps/openrc-0.11.3" || migrate_udev_mount_script
 }
 
 # >=openrc-0.4.0 no longer loads the udev addon
@@ -272,6 +272,15 @@
 	fi
 }
 
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"/etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"/etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	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





^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2012-09-28 21:18 William Hubbs (williamh)
  0 siblings, 0 replies; 19+ messages in thread
From: William Hubbs (williamh) @ 2012-09-28 21:18 UTC (permalink / raw
  To: gentoo-commits

williamh    12/09/28 21:18:26

  Modified:             openrc-9999.ebuild
  Log:
  Add sysfs and tmpfilesd.sysinit to the sysinit runlevel and
  tmpfilesd.boot to the boot runlevel when upgrading.
  
  (Portage version: 2.2.0_alpha134/cvs/Linux i686)

Revision  Changes    Path
1.106                sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.105&r2=1.106

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- openrc-9999.ebuild	28 Sep 2012 19:56:14 -0000	1.105
+++ openrc-9999.ebuild	28 Sep 2012 21:18:26 -0000	1.106
@@ -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.105 2012/09/28 19:56:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.106 2012/09/28 21:18:26 williamh Exp $
 
 EAPI=4
 
@@ -246,6 +246,12 @@
 	# 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
+		add_boot_init sysfs sysinit
+		add_boot_init tmpfilesd.sysinit sysinit
+		add_boot_init tmpfilesd.boot boot
+	fi
+
 	# set default interactive shell to sulogin if it exists
 	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
 





^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2012-09-28 19:56 William Hubbs (williamh)
  0 siblings, 0 replies; 19+ messages in thread
From: William Hubbs (williamh) @ 2012-09-28 19:56 UTC (permalink / raw
  To: gentoo-commits

williamh    12/09/28 19:56:15

  Modified:             openrc-9999.ebuild
  Log:
  one more prefix fix.
  
  (Portage version: 2.2.0_alpha134/cvs/Linux i686)

Revision  Changes    Path
1.105                sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.104&r2=1.105

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- openrc-9999.ebuild	28 Sep 2012 16:32:31 -0000	1.104
+++ openrc-9999.ebuild	28 Sep 2012 19:56:14 -0000	1.105
@@ -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.104 2012/09/28 16:32:31 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.105 2012/09/28 19:56:14 williamh Exp $
 
 EAPI=4
 
@@ -161,7 +161,7 @@
 	fi
 
 	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
-	ln -snf /etc/init.d/${initd} "${EROOT}"/etc/runlevels/${runlevel}/${initd}
+	ln -snf "${EROOT}"/etc/init.d/${initd} "${EROOT}"/etc/runlevels/${runlevel}/${initd}
 }
 add_boot_init_mit_config() {
 	local config=$1 initd=$2





^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2009-06-08 12:27 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2009-06-08 12:27 UTC (permalink / raw
  To: gentoo-commits

vapier      09/06/08 12:27:47

  Modified:             openrc-9999.ebuild
  Log:
  set LIBEXECDIR to /lib/rc/

Revision  Changes    Path
1.48                 sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.47&r2=1.48

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- openrc-9999.ebuild	8 Jun 2009 11:45:39 -0000	1.47
+++ openrc-9999.ebuild	8 Jun 2009 12:27:47 -0000	1.48
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.47 2009/06/08 11:45:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.48 2009/06/08 12:27:47 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -38,7 +38,7 @@
 pkg_setup() {
 	unset LIBDIR #266688
 
-	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir)"
+	MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=$(get_libdir)/rc"
 
 	local brand="Unknown"
 	if use kernel_linux ; then






^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-05-31  7:06 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-05-31  7:06 UTC (permalink / raw
  To: gentoo-commits

vapier      08/05/31 07:06:15

  Modified:             openrc-9999.ebuild
  Log:
  add the net.lo check from older versions
  (Portage version: 2.2_pre5.spank.spunk)

Revision  Changes    Path
1.35                 sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.34&r2=1.35

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- openrc-9999.ebuild	31 May 2008 07:04:58 -0000	1.34
+++ openrc-9999.ebuild	31 May 2008 07:06:15 -0000	1.35
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.34 2008/05/31 07:04:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.35 2008/05/31 07:06:15 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -160,6 +160,7 @@
 	# force net init.d scripts into symlinks
 	for f in "${ROOT}"/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."



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-26 20:12 Doug Klima (cardoe)
  0 siblings, 0 replies; 19+ messages in thread
From: Doug Klima (cardoe) @ 2008-03-26 20:12 UTC (permalink / raw
  To: gentoo-commits

cardoe      08/03/26 20:12:15

  Modified:             openrc-9999.ebuild
  Log:
  sync ebuilds
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.13                 sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.12&r2=1.13

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openrc-9999.ebuild	26 Mar 2008 20:06:15 -0000	1.12
+++ openrc-9999.ebuild	26 Mar 2008 20:12:15 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.12 2008/03/26 20:06:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.13 2008/03/26 20:12:15 cardoe Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -122,7 +122,7 @@
 	fi
 
 	# upgrade timezone file
-	if [[ ! -e ${ROOT}/etc/timezone ]] ; then
+	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
 		(
 		source "${ROOT}"/etc/conf.d/clock
 		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-25 12:57 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-25 12:57 UTC (permalink / raw
  To: gentoo-commits

vapier      08/03/25 12:57:17

  Modified:             openrc-9999.ebuild
  Log:
  set the VERSION to the last git commit
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.10                 sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.9&r2=1.10

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openrc-9999.ebuild	25 Mar 2008 12:34:52 -0000	1.9
+++ openrc-9999.ebuild	25 Mar 2008 12:57:16 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.9 2008/03/25 12:34:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.10 2008/03/25 12:57:16 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -57,7 +57,18 @@
 }
 
 src_compile() {
+	# catch people running `ebuild` w/out setup
+	if [[ -z ${MAKE_ARGS} ]] ; then
+		die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?"
+	fi
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)"
+		sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile
+	fi
+
 	tc-export CC AR RANLIB
+	echo emake ${MAKE_ARGS}
 	emake ${MAKE_ARGS} || die
 }
 



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-25 12:34 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-25 12:34 UTC (permalink / raw
  To: gentoo-commits

vapier      08/03/25 12:34:52

  Modified:             openrc-9999.ebuild
  Log:
  fix typo in timezone upgrade #214650
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.9                  sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.8&r2=1.9

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openrc-9999.ebuild	25 Mar 2008 12:26:51 -0000	1.8
+++ openrc-9999.ebuild	25 Mar 2008 12:34:52 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.8 2008/03/25 12:26:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.9 2008/03/25 12:34:52 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -91,7 +91,7 @@
 	# upgrade timezone file
 	if [[ ! -e ${ROOT}/etc/timezone ]] ; then
 		(
-		source "${ROOT}"/etc/conf.d/timezone
+		source "${ROOT}"/etc/conf.d/clock
 		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
 		)
 	fi



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-25 12:26 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-25 12:26 UTC (permalink / raw
  To: gentoo-commits

vapier      08/03/25 12:26:52

  Modified:             openrc-9999.ebuild
  Log:
  use module_<mod>_args_<ver> now that openrc supports it
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.8                  sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.7&r2=1.8

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openrc-9999.ebuild	25 Mar 2008 00:13:15 -0000	1.7
+++ openrc-9999.ebuild	25 Mar 2008 12:26:51 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.7 2008/03/25 00:13:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.8 2008/03/25 12:26:51 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -140,7 +140,7 @@
 					if ($0 ~ /^[^#]/) {
 						print "modules_" v "=\"${modules_" v "} " $1 "\""
 						gsub(/[^[:alnum:]]/, "_", $1)
-						printf "module_" $1 "_args=\""
+						printf "module_" $1 "_args_" v "=\""
 						for (i = 2; i <= NF; ++i) {
 							if (i > 2)
 								printf " "
@@ -152,8 +152,8 @@
 				}
 				END { print "\n### END: Auto-converted from " f "\n" }
 				' "${f}" >> "${D}"/etc/conf.d/modules
-				rm -f "${f}"
 			done
+				rm -f "${f}"
 			rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
 		fi
 	fi



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-25  0:13 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-25  0:13 UTC (permalink / raw
  To: gentoo-commits

vapier      08/03/25 00:13:16

  Modified:             openrc-9999.ebuild
  Log:
  get the list of services from the default boot runlevel rather than maintaining it in the ebuild
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.7                  sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.6&r2=1.7

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openrc-9999.ebuild	25 Mar 2008 00:07:54 -0000	1.6
+++ openrc-9999.ebuild	25 Mar 2008 00:13:15 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.6 2008/03/25 00:07:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.7 2008/03/25 00:13:15 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -85,6 +85,7 @@
 	# in the ass by accident
 	[[ -e ${ROOT}/etc/conf.d/net ]] && rm -f "${D}"/etc/conf.d/net
 
+	# everything below here is migration
 	has_version sys-apps/openrc && return 0
 
 	# upgrade timezone file
@@ -95,13 +96,11 @@
 		)
 	fi
 
-	# baselayout bootmisc init script has been split out in OpenRC
-	# so handle upgraders
-	local x= xtra=
-	use kernel_linux && xtra="${xtra} mtab procfs sysctl"
-	use kernel_FreeBSD && xtra="${xtra} dumpon savecore"
-	for x in fsck root swap ${xtra} ; do
+	# baselayout boot init scripts have been split out
+	local x
+	for x in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
 		[[ -e ${ROOT}/etc/runlevels/boot/${x} ]] && continue
+		elog "Auto-adding '${x}' service to your boot runlevel"
 		ln -snf /etc/init.d/${x} "${ROOT}"/etc/runlevels/boot/${x}
 	done
 



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-25  0:07 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-25  0:07 UTC (permalink / raw
  To: gentoo-commits

vapier      08/03/25 00:07:55

  Modified:             openrc-9999.ebuild
  Log:
  put EGIT vars before inheriting git
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.6                  sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.5&r2=1.6

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openrc-9999.ebuild	24 Mar 2008 21:58:30 -0000	1.5
+++ openrc-9999.ebuild	25 Mar 2008 00:07:54 -0000	1.6
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 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.5 2008/03/24 21:58:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.6 2008/03/25 00:07:54 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit git
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
 	EGIT_BRANCH="Gentoo"
+	inherit git
 else
 	SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2"
 fi



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-24  7:30 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-24  7:30 UTC (permalink / raw
  To: gentoo-commits

vapier      08/03/24 07:30:19

  Modified:             openrc-9999.ebuild
  Log:
  use the Gentoo branch
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.4                  sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.3&r2=1.4

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openrc-9999.ebuild	23 Mar 2008 17:40:46 -0000	1.3
+++ openrc-9999.ebuild	24 Mar 2008 07:30:18 -0000	1.4
@@ -1,12 +1,13 @@
 # Copyright 1999-2008 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.3 2008/03/23 17:40:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.4 2008/03/24 07:30:18 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
+	EGIT_BRANCH="Gentoo"
 else
 	SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2"
 fi



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-23 17:40 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-23 17:40 UTC (permalink / raw
  To: gentoo-commits

vapier      08/03/23 17:40:46

  Modified:             openrc-9999.ebuild
  Log:
  fix typo in pkg_preinst as pointed out by Matěj Laitl #214401
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.3                  sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.2&r2=1.3

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openrc-9999.ebuild	23 Mar 2008 00:04:00 -0000	1.2
+++ openrc-9999.ebuild	23 Mar 2008 17:40:46 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.2 2008/03/23 00:04:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.3 2008/03/23 17:40:46 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -84,7 +84,7 @@
 	# in the ass by accident
 	[[ -e ${ROOT}/etc/conf.d/net ]] && rm -f "${D}"/etc/conf.d/net
 
-	has_version sys-apps/openrc || return 0
+	has_version sys-apps/openrc && return 0
 
 	# upgrade timezone file
 	if [[ ! -e ${ROOT}/etc/timezone ]] ; then



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild
@ 2008-03-23  0:04 Mike Frysinger (vapier)
  0 siblings, 0 replies; 19+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-23  0:04 UTC (permalink / raw
  To: gentoo-commits

vapier      08/03/23 00:04:00

  Modified:             openrc-9999.ebuild
  Log:
  blah, whitespace
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.2                  sys-apps/openrc/openrc-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.1&r2=1.2

Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openrc-9999.ebuild	23 Mar 2008 00:03:21 -0000	1.1
+++ openrc-9999.ebuild	23 Mar 2008 00:04:00 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.1 2008/03/23 00:03:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.2 2008/03/23 00:04:00 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -20,7 +20,7 @@
 IUSE="debug ncurses pam static unicode kernel_linux kernel_FreeBSD"
 
 RDEPEND="virtual/init
- 	kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 )
+	kernel_linux? ( >=sys-apps/module-init-tools-3.2.2-r2 )
 	kernel_FreeBSD? ( sys-process/fuser-bsd )
 	ncurses? ( sys-libs/ncurses )
 	pam? ( virtual/pam )



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2013-09-16 20:47 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-24 21:58 [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild Mike Frysinger (vapier)
  -- strict thread matches above, loose matches on Subject: below --
2013-09-16 20:47 William Hubbs (williamh)
2013-07-26  2:05 William Hubbs (williamh)
2012-11-07 14:59 William Hubbs (williamh)
2012-10-31 23:43 William Hubbs (williamh)
2012-10-31 22:47 William Hubbs (williamh)
2012-09-28 21:18 William Hubbs (williamh)
2012-09-28 19:56 William Hubbs (williamh)
2009-06-08 12:27 Mike Frysinger (vapier)
2008-05-31  7:06 Mike Frysinger (vapier)
2008-03-26 20:12 Doug Klima (cardoe)
2008-03-25 12:57 Mike Frysinger (vapier)
2008-03-25 12:34 Mike Frysinger (vapier)
2008-03-25 12:26 Mike Frysinger (vapier)
2008-03-25  0:13 Mike Frysinger (vapier)
2008-03-25  0:07 Mike Frysinger (vapier)
2008-03-24  7:30 Mike Frysinger (vapier)
2008-03-23 17:40 Mike Frysinger (vapier)
2008-03-23  0:04 Mike Frysinger (vapier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox