| 1 |
heroxbd 12/09/29 03:15:54 |
| 2 |
|
| 3 |
Modified: openrc-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
make_args should be called only once; ED -> D in src_install to avoid double prefix. close 415899 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.108 sys-apps/openrc/openrc-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.108&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.108&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.107&r2=1.108 |
| 15 |
|
| 16 |
Index: openrc-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v |
| 19 |
retrieving revision 1.107 |
| 20 |
retrieving revision 1.108 |
| 21 |
diff -u -r1.107 -r1.108 |
| 22 |
--- openrc-9999.ebuild 28 Sep 2012 22:05:15 -0000 1.107 |
| 23 |
+++ openrc-9999.ebuild 29 Sep 2012 03:15:54 -0000 1.108 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.107 2012/09/28 22:05:15 williamh Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.108 2012/09/29 03:15:54 heroxbd Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -101,8 +101,8 @@ |
| 33 |
} |
| 34 |
|
| 35 |
src_install() { |
| 36 |
- make_args |
| 37 |
- emake ${MAKE_ARGS} DESTDIR="${ED}" install |
| 38 |
+ [[ -z "${MAKE_ARGS}" ]] && make_args |
| 39 |
+ emake ${MAKE_ARGS} DESTDIR="${D}" install |
| 40 |
|
| 41 |
# move the shared libs back to /usr so ldscript can install |
| 42 |
# more of a minimal set of files |
| 43 |
@@ -212,7 +212,7 @@ |
| 44 |
rm -f "${EROOT}"/etc/init.d/clock |
| 45 |
fi |
| 46 |
if [[ -L ${EROOT}/etc/runlevels/boot/clock ]] ; then |
| 47 |
- rm -f "${EROOT}"/etc/runlevels/boot/clock |
| 48 |
+ rm -f "${EROOT}"/etc/runlevels/boot/clock |
| 49 |
ln -snf /etc/init.d/${clock} "${EROOT}"/etc/runlevels/boot/${clock} |
| 50 |
fi |
| 51 |
if [[ -L ${EROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.230 sys-apps/openrc/ChangeLog |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.230&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.230&content-type=text/plain |
| 59 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.229&r2=1.230 |
| 60 |
|
| 61 |
Index: ChangeLog |
| 62 |
=================================================================== |
| 63 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v |
| 64 |
retrieving revision 1.229 |
| 65 |
retrieving revision 1.230 |
| 66 |
diff -u -r1.229 -r1.230 |
| 67 |
--- ChangeLog 28 Sep 2012 22:05:15 -0000 1.229 |
| 68 |
+++ ChangeLog 29 Sep 2012 03:15:54 -0000 1.230 |
| 69 |
@@ -1,6 +1,10 @@ |
| 70 |
# ChangeLog for sys-apps/openrc |
| 71 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 72 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.229 2012/09/28 22:05:15 williamh Exp $ |
| 73 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.230 2012/09/29 03:15:54 heroxbd Exp $ |
| 74 |
+ |
| 75 |
+ 29 Sep 2012; Benda Xu <heroxbd@g.o> openrc-9999.ebuild: |
| 76 |
+ make_args should be called only once; ED -> D in src_install to avoid double |
| 77 |
+ prefix. close 415899 |
| 78 |
|
| 79 |
28 Sep 2012; William Hubbs <williamh@g.o> openrc-9999.ebuild: |
| 80 |
fix typo |
Archives