summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mylchreest <johnm@gentoo.org>2005-03-06 11:28:39 +0000
committerJohn Mylchreest <johnm@gentoo.org>2005-03-06 11:28:39 +0000
commit739871aeffb39e5340932ebd5036b0e9e34b6d2d (patch)
treec86e41cb9e878bf7842620d20d1b83874f7e8f79 /eclass/kernel-2.eclass
parentStable on x86. (diff)
downloadgentoo-2-739871aeffb39e5340932ebd5036b0e9e34b6d2d.tar.gz
gentoo-2-739871aeffb39e5340932ebd5036b0e9e34b6d2d.tar.bz2
gentoo-2-739871aeffb39e5340932ebd5036b0e9e34b6d2d.zip
Fixes bug #84189
Diffstat (limited to 'eclass/kernel-2.eclass')
-rw-r--r--eclass/kernel-2.eclass23
1 files changed, 12 insertions, 11 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 1c9297cd7cd1..76ec7a8b85fa 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.106 2005/03/02 18:54:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.107 2005/03/06 11:28:39 johnm Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -32,7 +32,7 @@
# postinst and can be used to carry additional postinst
# messages
# K_EXTRAEWARN - same as K_EXTRAEINFO except ewarn's instead of einfo's
-# K_SYMLINK - if this is set, then forcably create symlink anyway
+# K_SYMLINK - if this is set, then forcably create symlink anyway
#
# K_DEFCONFIG - Allow specifying a different defconfig target. If length zero,
# defaults to "defconfig".
@@ -171,12 +171,6 @@ universal_unpack() {
# remove all backup files
find . -iname "*~" -exec rm {} \; 2> /dev/null
- if [[ -d ${S}/Documentation/DocBook ]]; then
- cd ${S}/Documentation/DocBook
- sed -ie "s:db2:docbook2:g" Makefile
- cd ${OLDPWD}
- fi
-
# fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox
use ppc && \
sed -ie 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \
@@ -196,6 +190,14 @@ unpack_fix_install_path() {
sed -i -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' Makefile
}
+unpack_fix_docbook() {
+ if [[ -d ${S}/Documentation/DocBook ]]; then
+ cd ${S}/Documentation/DocBook
+ sed -ie "s:db2:docbook2:g" Makefile
+ cd ${OLDPWD}
+ fi
+}
+
# Compile Functions
#==============================================================
compile_headers() {
@@ -815,9 +817,8 @@ kernel-2_src_unpack() {
[[ -n ${UNIPATCH_LIST} ]] || [[ -n ${UNIPATCH_LIST_DEFAULT} ]] && \
unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST}"
- [ -z "${K_NOSETEXTRAVERSION}" ] && \
- unpack_set_extraversion
-
+ [[ -z ${K_NOSETEXTRAVERSION} ]] && unpack_set_extraversion
+ unpack_fix_docbook
unpack_fix_install_path
kernel_is 2 4 && unpack_2_4