| 1 |
commit: 5298548230002f61f280ee6ec374ca06537d7fb6 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 18 16:17:43 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 18 16:18:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52985482 |
| 7 |
|
| 8 |
sys-apps/sysvinit: Use separate sed command for logsave removal. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.61, Repoman-2.3.12 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/sysvinit/sysvinit-2.94_beta.ebuild | 11 ++++++++--- |
| 14 |
1 file changed, 8 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild |
| 17 |
index c79dc75f1d4..bb9842d5c6a 100644 |
| 18 |
--- a/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild |
| 19 |
+++ b/sys-apps/sysvinit/sysvinit-2.94_beta.ebuild |
| 20 |
@@ -39,10 +39,9 @@ src_prepare() { |
| 21 |
sed -i '/^CPPFLAGS =$/d' src/Makefile || die |
| 22 |
|
| 23 |
# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux |
| 24 |
- # logsave is already in e2fsprogs |
| 25 |
sed -i -r \ |
| 26 |
- -e '/^(USR)?S?BIN/s:\<(last|lastb|logsave|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ |
| 27 |
- -e '/^MAN[18]/s:\<(last|lastb|logsave|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ |
| 28 |
+ -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ |
| 29 |
+ -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ |
| 30 |
src/Makefile || die |
| 31 |
|
| 32 |
# pidof has moved to >=procps-3.3.9 |
| 33 |
@@ -51,6 +50,12 @@ src_prepare() { |
| 34 |
-e '/^MAN8/s:\<pidof.8\>::g' \ |
| 35 |
src/Makefile || die |
| 36 |
|
| 37 |
+ # logsave is already in e2fsprogs |
| 38 |
+ sed -i -r \ |
| 39 |
+ -e '/^(USR)?S?BIN/s:\<logsave\>::g' \ |
| 40 |
+ -e '/^MAN8/s:\<logsave.8\>::g' \ |
| 41 |
+ src/Makefile || die |
| 42 |
+ |
| 43 |
# Mung inittab for specific architectures |
| 44 |
cd "${WORKDIR}" || die |
| 45 |
cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab" |
Archives