diff options
| author |   Joshua Kinard <kumba@gentoo.org> | 2003-11-16 18:17:28 +0000 |
|---|---|---|
| committer | Joshua Kinard <kumba@gentoo.org> | 2003-11-16 18:17:28 +0000 |
| commit | bc0f2e39ec41afffa58347437f49a4cd966271a4 (patch) | |
| tree | 385957e2391965988cf2cfd4b356f9c71ad08892 /eclass | |
| parent | Variable re-ordering to adjust to new kernel.eclass behaviour (diff) | |
| download | gentoo-2-bc0f2e39ec41afffa58347437f49a4cd966271a4.tar.gz gentoo-2-bc0f2e39ec41afffa58347437f49a4cd966271a4.tar.bz2 gentoo-2-bc0f2e39ec41afffa58347437f49a4cd966271a4.zip | |
Added an if statement to see if EXTRAVERSION contains exactly 1 space, and
if so, do not edit the Makefile of the kernel source to set the EXTRAVERSION
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kernel.eclass | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/eclass/kernel.eclass b/eclass/kernel.eclass index 7a5ac64db9dd..b42a58d1089e 100644 --- a/eclass/kernel.eclass +++ b/eclass/kernel.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel.eclass,v 1.36 2003/11/07 19:18:47 johnm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel.eclass,v 1.37 2003/11/16 18:17:28 kumba Exp $ # # This eclass contains the common functions to be used by all lostlogic # based kernel ebuilds @@ -112,8 +112,15 @@ kernel_universal_unpack() { cd ${S} mv Makefile Makefile.orig sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \ - -e "s:^\(EXTRAVERSION =\).*:\1 -$(echo ${KV} | cut -d- -f2,3,4,5):" \ Makefile.orig >Makefile || die # test, remove me if Makefile ok + + # <kumba@gentoo.org> (16 Nov 2003) + # We don't need to append an EXTRAVERSION all the time, so see if EXTRAVERSION contains 1 space + # If it does, don't run this sed command + if [ "${EXTRAVERSION}" != " " ]; then + sed -e "s:^\(EXTRAVERSION =\).*:\1 -$(echo ${KV} | cut -d- -f2,3,4,5):" \ + Makefile.orig >Makefile || die # test, remove me if Makefile ok + fi rm Makefile.orig if [ -d "${S}/Documentation/DocBook" ] |