1 |
williamh 11/11/16 19:50:05 |
2 |
|
3 |
Modified: ChangeLog openrc-9999.ebuild |
4 |
Log: |
5 |
since oldnet is now the default upstream, we do not need to force this in the ebuild. |
6 |
|
7 |
(Portage version: 2.2.0_alpha74/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.173 sys-apps/openrc/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.173&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.173&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.172&r2=1.173 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v |
19 |
retrieving revision 1.172 |
20 |
retrieving revision 1.173 |
21 |
diff -u -r1.172 -r1.173 |
22 |
--- ChangeLog 7 Nov 2011 12:57:19 -0000 1.172 |
23 |
+++ ChangeLog 16 Nov 2011 19:50:05 -0000 1.173 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for sys-apps/openrc |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.172 2011/11/07 12:57:19 aballier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.173 2011/11/16 19:50:05 williamh Exp $ |
29 |
+ |
30 |
+ 16 Nov 2011; William Hubbs <williamh@g.o> openrc-9999.ebuild: |
31 |
+ Since oldnet is now the default upstream, we do not need to force this |
32 |
+ in the ebuild. |
33 |
|
34 |
07 Nov 2011; Alexis Ballier <aballier@g.o> openrc-0.8.3-r1.ebuild, |
35 |
openrc-0.9.2.ebuild, openrc-0.9.3.ebuild, openrc-0.9.3-r1.ebuild, |
36 |
|
37 |
|
38 |
|
39 |
1.89 sys-apps/openrc/openrc-9999.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.89&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.89&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.88&r2=1.89 |
44 |
|
45 |
Index: openrc-9999.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v |
48 |
retrieving revision 1.88 |
49 |
retrieving revision 1.89 |
50 |
diff -u -r1.88 -r1.89 |
51 |
--- openrc-9999.ebuild 7 Nov 2011 12:57:19 -0000 1.88 |
52 |
+++ openrc-9999.ebuild 16 Nov 2011 19:50:05 -0000 1.89 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.88 2011/11/07 12:57:19 aballier Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.89 2011/11/16 19:50:05 williamh Exp $ |
58 |
|
59 |
EAPI=4 |
60 |
|
61 |
@@ -36,7 +36,6 @@ |
62 |
unset LIBDIR #266688 |
63 |
|
64 |
MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc" |
65 |
- MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes" |
66 |
|
67 |
local brand="Unknown" |
68 |
if use kernel_linux ; then |
69 |
@@ -95,9 +94,6 @@ |
70 |
make_args |
71 |
emake ${MAKE_ARGS} DESTDIR="${D}" install |
72 |
|
73 |
- # install the readme for the new network scripts |
74 |
- dodoc README.newnet |
75 |
- |
76 |
# move the shared libs back to /usr so ldscript can install |
77 |
# more of a minimal set of files |
78 |
# disabled for now due to #270646 |
79 |
@@ -113,12 +109,8 @@ |
80 |
cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die |
81 |
rm -rf "${D}"/etc/runlevels |
82 |
|
83 |
- # Stick with "old" net as the default for now |
84 |
- doconfd conf.d/net || die |
85 |
- pushd "${D}"/usr/share/${PN}/runlevels/boot > /dev/null |
86 |
- rm -f network staticroute |
87 |
- ln -s /etc/init.d/net.lo net.lo |
88 |
- popd > /dev/null |
89 |
+ # Install the default net configuration |
90 |
+ doconfd conf.d/net |
91 |
|
92 |
# Setup unicode defaults for silly unicode users |
93 |
set_config_yes_no /etc/rc.conf unicode use unicode |