Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/runit/, sys-process/runit/files/
Date: Fri, 14 May 2021 10:04:29
Message-Id: 1620986640.ec055d7a3ff7a05e7964effd1282ea7ca0f47f0d.soap@gentoo
1 commit: ec055d7a3ff7a05e7964effd1282ea7ca0f47f0d
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 14 10:04:00 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri May 14 10:04:00 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec055d7a
7
8 sys-process/runit: Remove old 2.1.1-r2
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sys-process/runit/Manifest | 1 -
14 sys-process/runit/files/1 | 10 -----
15 sys-process/runit/files/2 | 6 ---
16 sys-process/runit/files/3 | 14 -------
17 sys-process/runit/files/run.getty | 2 -
18 sys-process/runit/runit-2.1.1-r2.ebuild | 72 ---------------------------------
19 6 files changed, 105 deletions(-)
20
21 diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest
22 index 864faf5a71e..8331848d7bf 100644
23 --- a/sys-process/runit/Manifest
24 +++ b/sys-process/runit/Manifest
25 @@ -1,2 +1 @@
26 -DIST runit-2.1.1.tar.gz 109661 BLAKE2B 3962d3cb0d3d9f612bcef40939cba7d71f0bb338281578f4a2c3ec10a819e0d90c3d6cb6c3992226a5aaaa7e5f282a64abadac762422221f7abe0aedbffc2249 SHA512 a927a757386653fdc40437884e3dc2d1dda6aaf5f1919f301fcf604e559836bd44e5fcb296d69e7f4260fd881475124c44996530de4948d35d8a102b206ca470
27 DIST runit-2.1.2.tar.gz 110916 BLAKE2B 101e514aeed282685ebe636f401ca6f94d157281d08a3ac487340aebe945b82d2ee01d41e9917446f4ebd7b27fe9fd18ba4ad55739ab1b62a0e59e1c438b55e9 SHA512 a18773ebf1aa22305dd89ed67363165b9fcf86c192b2be4e268d08005dd82d51265160c637abe072f2f2e378c4b315a75bd3d3e602c3e75bdd451a3b0190f8cf
28
29 diff --git a/sys-process/runit/files/1 b/sys-process/runit/files/1
30 deleted file mode 100644
31 index d6a5b4f64ee..00000000000
32 --- a/sys-process/runit/files/1
33 +++ /dev/null
34 @@ -1,10 +0,0 @@
35 -#!/bin/sh
36 -# system one time tasks
37 -
38 -PATH=/sbin:/usr/sbin:/bin:/usr/bin
39 -
40 -RUNLEVEL=S /sbin/rc sysinit
41 -RUNLEVEL=S /sbin/rc boot
42 -
43 -touch /etc/runit/stopit
44 -chmod 0 /etc/runit/stopit
45
46 diff --git a/sys-process/runit/files/2 b/sys-process/runit/files/2
47 deleted file mode 100644
48 index 233ad006aac..00000000000
49 --- a/sys-process/runit/files/2
50 +++ /dev/null
51 @@ -1,6 +0,0 @@
52 -#!/bin/sh
53 -
54 -PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
55 -
56 -exec env - PATH=$PATH \
57 -runsvdir /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
58
59 diff --git a/sys-process/runit/files/3 b/sys-process/runit/files/3
60 deleted file mode 100644
61 index f143f5f4601..00000000000
62 --- a/sys-process/runit/files/3
63 +++ /dev/null
64 @@ -1,14 +0,0 @@
65 -#!/bin/sh
66 -exec >/dev/console 2>&1
67 -PATH=/sbin:/usr/sbin:/bin:/usr/bin
68 -
69 -echo 'Waiting for getties to stop...'
70 -sv shutdown -w 10 /var/service/getty-*
71 -
72 -echo 'Waiting for services to stop...'
73 -sv shutdown -w 300 /var/service/*
74 -
75 -echo 'Shutdown...'
76 -test -x /etc/runit/reboot && LAST=6 || LAST=0
77 -test -x /etc/runit/reboot && RC=reboot || RC=shutdown
78 -RUNLEVEL=$LAST /sbin/rc $RC
79
80 diff --git a/sys-process/runit/files/run.getty b/sys-process/runit/files/run.getty
81 deleted file mode 100644
82 index ab6f9543fe9..00000000000
83 --- a/sys-process/runit/files/run.getty
84 +++ /dev/null
85 @@ -1,2 +0,0 @@
86 -#!/bin/sh
87 -exec /sbin/agetty 38400 TTY linux
88
89 diff --git a/sys-process/runit/runit-2.1.1-r2.ebuild b/sys-process/runit/runit-2.1.1-r2.ebuild
90 deleted file mode 100644
91 index d556c6541a8..00000000000
92 --- a/sys-process/runit/runit-2.1.1-r2.ebuild
93 +++ /dev/null
94 @@ -1,72 +0,0 @@
95 -# Copyright 1999-2021 Gentoo Authors
96 -# Distributed under the terms of the GNU General Public License v2
97 -
98 -EAPI=6
99 -
100 -inherit toolchain-funcs flag-o-matic
101 -
102 -DESCRIPTION="A UNIX init scheme with service supervision"
103 -HOMEPAGE="http://smarden.org/runit/"
104 -SRC_URI="http://smarden.org/runit/${P}.tar.gz"
105 -
106 -LICENSE="BSD"
107 -SLOT="0"
108 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
109 -IUSE="static"
110 -
111 -S=${WORKDIR}/admin/${P}/src
112 -
113 -src_prepare() {
114 - default
115 - # we either build everything or nothing static
116 - sed -i -e 's:-static: :' Makefile || die "sed of Makefile failed"
117 -}
118 -
119 -src_configure() {
120 - use static && append-ldflags -static
121 -
122 - echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die "setting cflags"
123 - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die "setting ldflags failed"
124 -}
125 -
126 -src_install() {
127 - keepdir /etc/runit{,/runsvdir{,/default,/all}}
128 - dosym default /etc/runit/runsvdir/current
129 - dosym ../etc/runit/runsvdir/current /var/service
130 - dosym ../etc/runit/2 /sbin/runsvdir-start
131 -
132 - dobin $(<../package/commands)
133 - dodir /sbin
134 - mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin"
135 -
136 - cd "${S}"/..
137 - dodoc package/{CHANGES,README,THANKS,TODO}
138 - dohtml doc/*.html
139 - doman man/*.[18]
140 -
141 - exeinto /etc/runit
142 - doexe "${FILESDIR}"/{1,2,3,ctrlaltdel}
143 - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do
144 - exeinto /etc/runit/runsvdir/all/getty-$tty/
145 - for script in run finish; do
146 - newexe "${FILESDIR}"/$script.getty $script
147 - sed -i -e "s:TTY:${tty}:g" "${ED}"/etc/runit/runsvdir/all/getty-$tty/$script
148 - done
149 - dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty
150 - done
151 -
152 - # make sv command work
153 - cd "${S}"
154 - insinto /etc/env.d
155 - cat <<-EOF > env.d
156 - #/etc/env.d/20runit
157 - SVDIR="/var/service/"
158 - EOF
159 - newins env.d 20runit
160 -}
161 -
162 -pkg_postinst() {
163 - ewarn "/etc/profile was updated. Please run:"
164 - ewarn "source /etc/profile"
165 - ewarn "to make 'sv' work correctly on your currently open shells"
166 -}