| 1 |
tomwij 13/04/29 22:14:23 |
| 2 |
|
| 3 |
Modified: ChangeLog kernel-2.eclass |
| 4 |
Log: |
| 5 |
Corrected UNIPATCH_DOCS functionality, a mistake slipped through testing and review, fixes bug #467916 reported by Alexandros Diamantidis. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.804 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.804&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.804&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.803&r2=1.804 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.803 |
| 18 |
retrieving revision 1.804 |
| 19 |
diff -u -r1.803 -r1.804 |
| 20 |
--- ChangeLog 28 Apr 2013 18:59:59 -0000 1.803 |
| 21 |
+++ ChangeLog 29 Apr 2013 22:14:23 -0000 1.804 |
| 22 |
@@ -1,6 +1,11 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.803 2013/04/28 18:59:59 tetromino Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.804 2013/04/29 22:14:23 tomwij Exp $ |
| 27 |
+ |
| 28 |
+ 29 Apr 2013; Tom Wijsman <TomWij@g.o> kernel-2.eclass: |
| 29 |
+ Corrected UNIPATCH_DOCS functionality, this went unnoticed since |
| 30 |
+ dodoc can be called without arguments in Portage. Thanks to the |
| 31 |
+ Paludis user Alexandros Diamantidis in bug #467916 for reporting. |
| 32 |
|
| 33 |
28 Apr 2013; Alexandre Rostovtsev <tetromino@g.o> autotools.eclass: |
| 34 |
Reverting autotools.eclass commit that broke eautoreconf (bug #467772), acked |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.284 eclass/kernel-2.eclass |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.284&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.284&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.283&r2=1.284 |
| 43 |
|
| 44 |
Index: kernel-2.eclass |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 47 |
retrieving revision 1.283 |
| 48 |
retrieving revision 1.284 |
| 49 |
diff -u -r1.283 -r1.284 |
| 50 |
--- kernel-2.eclass 17 Apr 2013 20:59:24 -0000 1.283 |
| 51 |
+++ kernel-2.eclass 29 Apr 2013 22:14:23 -0000 1.284 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.283 2013/04/17 20:59:24 tomwij Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.284 2013/04/29 22:14:23 tomwij Exp $ |
| 57 |
|
| 58 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 59 |
# series of kernel with back-compatibility for 2.4 |
| 60 |
@@ -742,8 +742,10 @@ |
| 61 |
|
| 62 |
mv ${WORKDIR}/linux* "${D}"/usr/src |
| 63 |
|
| 64 |
- if [[ -z ${UNIPATCH_DOCS} ]] ; then |
| 65 |
- dodoc ${UNIPATCH_DOCS} |
| 66 |
+ if [[ -n "${UNIPATCH_DOCS}" ]] ; then |
| 67 |
+ for i in ${UNIPATCH_DOCS}; do |
| 68 |
+ dodoc "${T}"/${i} |
| 69 |
+ done |
| 70 |
fi |
| 71 |
} |
| 72 |
|
| 73 |
@@ -1040,7 +1042,7 @@ |
| 74 |
for x in ${KPATCH_DIR}; do |
| 75 |
for i in ${UNIPATCH_DOCS}; do |
| 76 |
if [[ -f "${x}/${i}" ]] ; then |
| 77 |
- tmp="${tmp} \"${T}/${i}\"" |
| 78 |
+ tmp="${tmp} ${i}" |
| 79 |
cp -f "${x}/${i}" "${T}"/ |
| 80 |
fi |
| 81 |
done |
Archives