diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-04-17 20:59:24 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-04-17 20:59:24 +0000 |
| commit | a760808800f38d8879e71a387bb1206d0f7b888f (patch) | |
| tree | a8b3b6e8e76c7222222c90a476a654479ee831cd /eclass | |
| parent | Introduce USE=firmware-loader, as suggested by williamh. Check whether kernel... (diff) | |
| download | gentoo-2-a760808800f38d8879e71a387bb1206d0f7b888f.tar.gz gentoo-2-a760808800f38d8879e71a387bb1206d0f7b888f.tar.bz2 gentoo-2-a760808800f38d8879e71a387bb1206d0f7b888f.zip | |
Reverted .tmp_gas_check patch, see bug #336732.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index dc1a65a286ae..af7c68b64b55 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.792 2013/04/17 18:01:48 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.793 2013/04/17 20:59:24 tomwij Exp $ + + 17 Apr 2013; Tom Wijsman <TomWij@gentoo.org> kernel-2.eclass: + Reverted .tmp_gas_check patch, see bug #336732. 17 Apr 2013; Ralph Sennhauser <sera@gentoo.org> java-utils-2.eclass: Request package specific emerge --info in death hook. diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index fb3740267bca..4f48527557ed 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.282 2013/04/17 13:52:17 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.283 2013/04/17 20:59:24 tomwij Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -1171,11 +1171,11 @@ kernel-2_src_unpack() { if [[ -n ${KV_MINOR} && ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]] then sed -i \ - -e "s|TOUT := .tmp_gas_check|TOUT := \"${T}\"/.tmp_gas_check|" \ + -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ "${S}"/arch/ppc/Makefile else sed -i \ - -e "s|TOUT := .tmp_gas_check|TOUT := \"${T}\"/.tmp_gas_check|" \ + -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ "${S}"/arch/powerpc/Makefile fi } |