public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/, sys-process/runit/files/
@ 2016-11-10 22:47 William Hubbs
  0 siblings, 0 replies; 2+ messages in thread
From: William Hubbs @ 2016-11-10 22:47 UTC (permalink / raw
  To: gentoo-commits

commit:     6a6f7ee88f8842891dd5b0542cc431162d9ab7a4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 22:44:33 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 22:45:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6f7ee8

sys-process/runit: 2.1.2-r1 revision bump

This fixes the following issues:

https://bugs.gentoo.org/show_bug.cgi?id=562702
https://bugs.gentoo.org/show_bug.cgi?id=575478
https://bugs.gentoo.org/show_bug.cgi?id=588950
https://bugs.gentoo.org/show_bug.cgi?id=589532

Package-Manager: portage-2.3.0

 sys-process/runit/files/1-2.1.2         |  10 ++
 sys-process/runit/files/2-2.1.2         |   2 +-
 sys-process/runit/files/3-2.1.2         |   2 +-
 sys-process/runit/files/run.getty-2.1.2 |   2 +-
 sys-process/runit/runit-2.1.2-r1.ebuild | 157 ++++++++++++++++++++++++++++++++
 5 files changed, 170 insertions(+), 3 deletions(-)

diff --git a/sys-process/runit/files/1-2.1.2 b/sys-process/runit/files/1-2.1.2
new file mode 100644
index 00000000..9761472
--- /dev/null
+++ b/sys-process/runit/files/1-2.1.2
@@ -0,0 +1,10 @@
+#!/bin/sh
+# system one time tasks
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+RUNLEVEL=S /sbin/openrc sysinit
+RUNLEVEL=S /sbin/openrc boot
+
+touch /etc/runit/stopit
+chmod 0 /etc/runit/stopit

diff --git a/sys-process/runit/files/2-2.1.2 b/sys-process/runit/files/2-2.1.2
index 5d50370..a63a1b2 100644
--- a/sys-process/runit/files/2-2.1.2
+++ b/sys-process/runit/files/2-2.1.2
@@ -3,4 +3,4 @@
 PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
 
 exec env - PATH=$PATH \
-runsvdir /etc/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+runsvdir -P /etc/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'

diff --git a/sys-process/runit/files/3-2.1.2 b/sys-process/runit/files/3-2.1.2
index 3dd5a48..30e602c 100644
--- a/sys-process/runit/files/3-2.1.2
+++ b/sys-process/runit/files/3-2.1.2
@@ -11,4 +11,4 @@ sv -w 300 force-shutdown /etc/service/*
 echo 'Shutdown...'
 test -x /etc/runit/reboot && LAST=6    || LAST=0
 test -x /etc/runit/reboot && RC=reboot || RC=shutdown
-RUNLEVEL=$LAST /sbin/rc $RC
+RUNLEVEL=$LAST /sbin/openrc $RC

diff --git a/sys-process/runit/files/run.getty-2.1.2 b/sys-process/runit/files/run.getty-2.1.2
index 33b2e78..ab6f954 100644
--- a/sys-process/runit/files/run.getty-2.1.2
+++ b/sys-process/runit/files/run.getty-2.1.2
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/bin/chpst -P /sbin/agetty 38400 TTY linux
+exec /sbin/agetty 38400 TTY linux

diff --git a/sys-process/runit/runit-2.1.2-r1.ebuild b/sys-process/runit/runit-2.1.2-r1.ebuild
new file mode 100644
index 00000000..c874b77
--- /dev/null
+++ b/sys-process/runit/runit-2.1.2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="A UNIX init scheme with service supervision"
+HOMEPAGE="http://smarden.org/runit/"
+SRC_URI="http://smarden.org/runit/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static"
+
+RDEPEND="sys-apps/openrc"
+
+S=${WORKDIR}/admin/${P}/src
+
+src_prepare() {
+	default
+
+	# we either build everything or nothing static
+	sed -i -e 's:-static: :' Makefile
+
+	# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726008
+	[[ ${COMPILER} == "diet" ]] &&
+		use ppc &&
+		filter-flags "-mpowerpc-gpopt"
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
+}
+
+src_install() {
+	into /
+	dobin $(<../package/commands)
+	dodir /sbin
+	mv "${ED}"/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
+	dosym ../etc/runit/2 /sbin/runsvdir-start
+	into /usr
+
+	cd ..
+	dodoc package/{CHANGES,README,THANKS,TODO}
+	dohtml doc/*.html
+	doman man/*.[18]
+
+dodir /etc/runit
+	exeinto /etc/runit
+	doexe "${FILESDIR}"/ctrlaltdel
+	newexe "${FILESDIR}"/1-${PV} 1
+	newexe "${FILESDIR}"/2-${PV} 2
+	newexe "${FILESDIR}"/3-${PV} 3
+
+	dodir /etc/sv
+	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
+		exeinto /etc/sv/getty-$tty/
+		newexe "${FILESDIR}"/finish.getty finish
+		newexe "${FILESDIR}"/run.getty-${PV} run
+		for script in finish run; do
+			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/sv/getty-$tty/$script
+		done
+	done
+
+	# make sv command work
+	cat <<-EOF > "${T}"/env.d
+		#/etc/env.d/20runit
+		SVDIR="/etc/service/"
+	EOF
+	insinto /etc/env.d
+	newins "${T}"/env.d 20runit
+}
+
+pkg_preinst() {
+	if has_version 'sys-process/runit' &&
+		has_version '<sys-process/runit-2.1.2' &&
+		[ -d "${EROOT}"etc/runit/runsvdir/all ]; then
+		if [ -e "${EROOT}"etc/sv ]; then
+			mv -f "${EROOT}"etc/sv "${EROOT}"etc/sv.bak || die
+			ewarn "${EROOT}etc/sv was moved to ${EROOT}etc/sv.bak"
+		fi
+		mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv|| die
+		ln -sf "${EROOT}"etc/sv "${EROOT}"etc/runit/runsvdir/all || die
+		cp -a "${EROOT}"etc/runit/runsvdir "${T}" || die
+		touch "${T}"/make_var_service || die
+	fi
+}
+
+default_config() {
+	local sv="${EROOT}"etc/sv
+	local service="${EROOT}"etc/service
+	mkdir -p "${service}" || die
+	for x in tty1 tty2 tty3 tty4 tty5 tty6; do
+	ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die
+	done
+	einfo "The links to services runit will supervise are installed"
+	einfo "in $service."
+	einfo "If you need multiple runlevels, please see the documentation"
+	einfo "for how to set them up."
+	einfo
+}
+
+migrate_from_211() {
+	# Create /etc/service and /var/service if requested
+	if [ -e "${T}"/make_var_service ]; then
+		ln -sf "${EROOT}"etc/runit/runsvdir/current "${EROOT}"etc/service || die
+		ln -sf "${EROOT}"etc/runit/runsvdir/current "${EROOT}"var/service || die
+	fi
+	if [ -d "${T}"/runsvdir ]; then
+		cp -a "${T}"/runsvdir "${EROOT}"etc/runit || die
+	fi
+	return 0
+}
+
+pkg_preinst() {
+	if  has_version '<sys-process/runit-2.1.2'; then
+		pre_212=yes
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z $REPLACING_VERSIONS ]]; then
+		default_config
+	elif [[ -n $pre_212 ]]; then
+		migrate_from_211
+	fi
+
+	ewarn "To make sure sv works correctly in your currently open"
+	ewarn "shells, please run the following command:"
+	ewarn
+	ewarn "source /etc/profile"
+	ewarn
+
+	if [ -L "${EROOT}"var/service ]; then
+		ewarn "Once this version of runit is active, please remove the"
+		ewarn "compatibility symbolic link at ${EROOT}var/service"
+		ewarn "The correct path now is ${EROOT}etc/service"
+		ewarn
+	fi
+
+	if [ -L "${EROOT}"etc/runit/runsvdir/all ]; then
+		ewarn "${EROOT}etc/runit/runsvdir/all has moved to"
+		iewarn "${EROOT}etc/sv."
+		ewarn "Any symbolic links under ${EROOT}etc/runit/runsvdir"
+		ewarn "which point to services through ../all should be updated to"
+		ewarn "point to them through ${EROOT}etc/sv."
+		ewarn "Once that is done, ${EROOT}etc/runit/runsvdir/all should be"
+		ewarn "removed."
+		ewarn
+	fi
+}


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

* [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/, sys-process/runit/files/
@ 2021-05-14 10:04 David Seifert
  0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-05-14 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     ec055d7a3ff7a05e7964effd1282ea7ca0f47f0d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 10:04:00 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 14 10:04:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec055d7a

sys-process/runit: Remove old 2.1.1-r2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-process/runit/Manifest              |  1 -
 sys-process/runit/files/1               | 10 -----
 sys-process/runit/files/2               |  6 ---
 sys-process/runit/files/3               | 14 -------
 sys-process/runit/files/run.getty       |  2 -
 sys-process/runit/runit-2.1.1-r2.ebuild | 72 ---------------------------------
 6 files changed, 105 deletions(-)

diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
index 864faf5a71e..8331848d7bf 100644
--- a/sys-process/runit/Manifest
+++ b/sys-process/runit/Manifest
@@ -1,2 +1 @@
-DIST runit-2.1.1.tar.gz 109661 BLAKE2B 3962d3cb0d3d9f612bcef40939cba7d71f0bb338281578f4a2c3ec10a819e0d90c3d6cb6c3992226a5aaaa7e5f282a64abadac762422221f7abe0aedbffc2249 SHA512 a927a757386653fdc40437884e3dc2d1dda6aaf5f1919f301fcf604e559836bd44e5fcb296d69e7f4260fd881475124c44996530de4948d35d8a102b206ca470
 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf

diff --git a/sys-process/runit/files/1 b/sys-process/runit/files/1
deleted file mode 100644
index d6a5b4f64ee..00000000000
--- a/sys-process/runit/files/1
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# system one time tasks
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-RUNLEVEL=S /sbin/rc sysinit
-RUNLEVEL=S /sbin/rc boot
-
-touch /etc/runit/stopit
-chmod 0 /etc/runit/stopit

diff --git a/sys-process/runit/files/2 b/sys-process/runit/files/2
deleted file mode 100644
index 233ad006aac..00000000000
--- a/sys-process/runit/files/2
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
-
-exec env - PATH=$PATH \
-runsvdir /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'

diff --git a/sys-process/runit/files/3 b/sys-process/runit/files/3
deleted file mode 100644
index f143f5f4601..00000000000
--- a/sys-process/runit/files/3
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-exec >/dev/console 2>&1
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-echo 'Waiting for getties to stop...'
-sv shutdown -w 10 /var/service/getty-*
-
-echo 'Waiting for services to stop...'
-sv shutdown -w 300 /var/service/*
-
-echo 'Shutdown...'
-test -x /etc/runit/reboot && LAST=6    || LAST=0
-test -x /etc/runit/reboot && RC=reboot || RC=shutdown
-RUNLEVEL=$LAST /sbin/rc $RC

diff --git a/sys-process/runit/files/run.getty b/sys-process/runit/files/run.getty
deleted file mode 100644
index ab6f9543fe9..00000000000
--- a/sys-process/runit/files/run.getty
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /sbin/agetty 38400 TTY linux

diff --git a/sys-process/runit/runit-2.1.1-r2.ebuild b/sys-process/runit/runit-2.1.1-r2.ebuild
deleted file mode 100644
index d556c6541a8..00000000000
--- a/sys-process/runit/runit-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="A UNIX init scheme with service supervision"
-HOMEPAGE="http://smarden.org/runit/"
-SRC_URI="http://smarden.org/runit/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static"
-
-S=${WORKDIR}/admin/${P}/src
-
-src_prepare() {
-	default
-	# we either build everything or nothing static
-	sed -i -e 's:-static: :' Makefile || die "sed of Makefile failed"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	echo "$(tc-getCC) ${CFLAGS}"  > conf-cc || die "setting cflags"
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die "setting ldflags failed"
-}
-
-src_install() {
-	keepdir /etc/runit{,/runsvdir{,/default,/all}}
-	dosym default /etc/runit/runsvdir/current
-	dosym ../etc/runit/runsvdir/current /var/service
-	dosym ../etc/runit/2 /sbin/runsvdir-start
-
-	dobin $(<../package/commands)
-	dodir /sbin
-	mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
-
-	cd "${S}"/..
-	dodoc package/{CHANGES,README,THANKS,TODO}
-	dohtml doc/*.html
-	doman man/*.[18]
-
-	exeinto /etc/runit
-	doexe "${FILESDIR}"/{1,2,3,ctrlaltdel}
-	for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
-		exeinto /etc/runit/runsvdir/all/getty-$tty/
-		for script in run finish; do
-			newexe "${FILESDIR}"/$script.getty $script
-			sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/runit/runsvdir/all/getty-$tty/$script
-		done
-		dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty
-	done
-
-	# make sv command work
-	cd "${S}"
-	insinto /etc/env.d
-	cat <<-EOF > env.d
-		#/etc/env.d/20runit
-		SVDIR="/var/service/"
-	EOF
-	newins env.d 20runit
-}
-
-pkg_postinst() {
-	ewarn "/etc/profile was updated. Please run:"
-	ewarn "source /etc/profile"
-	ewarn "to make 'sv' work correctly on your currently open shells"
-}


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

end of thread, other threads:[~2021-05-14 10:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-14 10:04 [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/, sys-process/runit/files/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2016-11-10 22:47 William Hubbs

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