diff options
author | John Mylchreest <johnm@gentoo.org> | 2005-09-12 09:20:28 +0000 |
---|---|---|
committer | John Mylchreest <johnm@gentoo.org> | 2005-09-12 09:20:28 +0000 |
commit | ad4a397b8bf6ecf1867c254e6f573b6a2ae34580 (patch) | |
tree | 54e04ea2955b9604e0f24ac10d73c1d88e22c747 /eclass | |
parent | Stable on ppc (diff) | |
download | gentoo-2-ad4a397b8bf6ecf1867c254e6f573b6a2ae34580.tar.gz gentoo-2-ad4a397b8bf6ecf1867c254e6f573b6a2ae34580.tar.bz2 gentoo-2-ad4a397b8bf6ecf1867c254e6f573b6a2ae34580.zip |
Quick fix for some minor bugs. SHould now install docs in KPATCH_DIR OK (although the implementation is a little poor since there is a re-write which deals with everything correctly) and also checks docs exist first - I cant re-create this but its sane anyways.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/kernel-2.eclass | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index c6dd2d28cd17..1725ad360bdf 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.143 2005/08/31 14:39:04 brix Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.144 2005/09/12 09:20:28 johnm Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -505,7 +505,7 @@ install_sources() { for doc in ${UNIPATCH_DOCS}; do [[ -f ${doc} ]] && docs="${docs} ${doc}"; done if [[ -f ${S}/patches.txt ]]; then docs="${docs} ${S}/patches.txt"; fi use doc && ! use arm && ! use s390 && install_manpages - dodoc ${docs} + use doc && [[ -n ${docs} ]] && dodoc ${docs} mv ${WORKDIR}/linux* ${D}/usr/src } @@ -774,6 +774,16 @@ unipatch() { done done + # This is a quick, and kind of nasty hack to deal with UNIPATCH_DOCS which + # sit in KPATCH_DIR's. This is handled properly in the unipatch rewrite, + # which is why I'm not taking too much time over this. + local tmp + for i in ${UNIPATCH_DOCS}; do + tmp="${tmp} ${i//*\/}" + cp -f ${i} ${T}/ + done + UNIPATCH_DOCS="${tmp}" + # clean up KPATCH_DIR's - fixes bug #53610 for x in ${KPATCH_DIR}; do rm -Rf ${x}; done |