| 1 |
mpagano 12/06/06 17:00:09 |
| 2 |
|
| 3 |
Modified: ChangeLog kernel-2.eclass |
| 4 |
Log: |
| 5 |
Move ppc/powerpc fix to after we apply linux patches |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.293 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.293&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.293&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.292&r2=1.293 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.292 |
| 18 |
retrieving revision 1.293 |
| 19 |
diff -u -r1.292 -r1.293 |
| 20 |
--- ChangeLog 6 Jun 2012 15:43:45 -0000 1.292 |
| 21 |
+++ ChangeLog 6 Jun 2012 17:00:09 -0000 1.293 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.292 2012/06/06 15:43:45 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.293 2012/06/06 17:00:09 mpagano Exp $ |
| 27 |
+ |
| 28 |
+ 06 Jun 2012; Michael Pagano <mpagano@g.o> kernel-2.eclass: |
| 29 |
+ Move ppc/powerpc fix to after we apply linux patches |
| 30 |
|
| 31 |
06 Jun 2012; Michał Górny <mgorny@g.o> autotools-utils.eclass: |
| 32 |
Start using prune_libtool_files() from eutils, deprecate |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.276 eclass/kernel-2.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.276&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.276&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.275&r2=1.276 |
| 41 |
|
| 42 |
Index: kernel-2.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 45 |
retrieving revision 1.275 |
| 46 |
retrieving revision 1.276 |
| 47 |
diff -u -r1.275 -r1.276 |
| 48 |
--- kernel-2.eclass 17 Mar 2012 00:01:59 -0000 1.275 |
| 49 |
+++ kernel-2.eclass 6 Jun 2012 17:00:09 -0000 1.276 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2012 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.275 2012/03/17 00:01:59 mpagano Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.276 2012/06/06 17:00:09 mpagano Exp $ |
| 55 |
|
| 56 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 57 |
# series of kernel with back-compatibility for 2.4 |
| 58 |
@@ -578,19 +578,6 @@ |
| 59 |
# remove all backup files |
| 60 |
find . -iname "*~" -exec rm {} \; 2> /dev/null |
| 61 |
|
| 62 |
- # fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox |
| 63 |
- # only do this for kernel < 2.6.27 since this file does not exist in later |
| 64 |
- # kernels |
| 65 |
- if [[ -n ${KV_MINOR} && ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]] |
| 66 |
- then |
| 67 |
- sed -i \ |
| 68 |
- -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ |
| 69 |
- "${S}"/arch/ppc/Makefile |
| 70 |
- else |
| 71 |
- sed -i \ |
| 72 |
- -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ |
| 73 |
- "${S}"/arch/powerpc/Makefile |
| 74 |
- fi |
| 75 |
} |
| 76 |
|
| 77 |
unpack_set_extraversion() { |
| 78 |
@@ -1155,6 +1142,20 @@ |
| 79 |
cp "${DISTDIR}/${DEBLOB_CHECK_A}" "${T}/deblob-check" || die "cp ${DEBLOB_CHECK_A} failed" |
| 80 |
chmod +x "${T}/${DEBLOB_A}" "${T}/deblob-check" || die "chmod deblob scripts failed" |
| 81 |
fi |
| 82 |
+ |
| 83 |
+ # fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox |
| 84 |
+ # only do this for kernel < 2.6.27 since this file does not exist in later |
| 85 |
+ # kernels |
| 86 |
+ if [[ -n ${KV_MINOR} && ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]] |
| 87 |
+ then |
| 88 |
+ sed -i \ |
| 89 |
+ -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ |
| 90 |
+ "${S}"/arch/ppc/Makefile |
| 91 |
+ else |
| 92 |
+ sed -i \ |
| 93 |
+ -e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ |
| 94 |
+ "${S}"/arch/powerpc/Makefile |
| 95 |
+ fi |
| 96 |
} |
| 97 |
|
| 98 |
kernel-2_src_compile() { |
Archives