| 1 |
vapier 13/11/22 13:35:09 |
| 2 |
|
| 3 |
Modified: kernel-2.eclass |
| 4 |
Log: |
| 5 |
fix random style issues |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.291 eclass/kernel-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.291&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.291&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.290&r2=1.291 |
| 13 |
|
| 14 |
Index: kernel-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 17 |
retrieving revision 1.290 |
| 18 |
retrieving revision 1.291 |
| 19 |
diff -u -r1.290 -r1.291 |
| 20 |
--- kernel-2.eclass 18 Nov 2013 13:19:49 -0000 1.290 |
| 21 |
+++ kernel-2.eclass 22 Nov 2013 13:35:09 -0000 1.291 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.290 2013/11/18 13:19:49 tomwij Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.291 2013/11/22 13:35:09 vapier Exp $ |
| 27 |
|
| 28 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 29 |
# series of kernel with back-compatibility for 2.4 |
| 30 |
@@ -232,7 +232,7 @@ |
| 31 |
if [[ ${#OKV_ARRAY[@]} -lt 3 ]]; then |
| 32 |
KV_PATCH_ARR=(${KV_PATCH//\./ }) |
| 33 |
|
| 34 |
- # at this point 031412, Linus is putting all 3.x kernels in a |
| 35 |
+ # at this point 031412, Linus is putting all 3.x kernels in a |
| 36 |
# 3.x directory, may need to revisit when 4.x is released |
| 37 |
KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x" |
| 38 |
|
| 39 |
@@ -437,12 +437,16 @@ |
| 40 |
|
| 41 |
# Capture the sources type and set DEPENDs |
| 42 |
if [[ ${ETYPE} == sources ]]; then |
| 43 |
- DEPEND="!build? ( sys-apps/sed |
| 44 |
- >=sys-devel/binutils-2.11.90.0.31 )" |
| 45 |
- RDEPEND="!build? ( >=sys-libs/ncurses-5.2 |
| 46 |
- sys-devel/make |
| 47 |
- dev-lang/perl |
| 48 |
- sys-devel/bc )" |
| 49 |
+ DEPEND="!build? ( |
| 50 |
+ sys-apps/sed |
| 51 |
+ >=sys-devel/binutils-2.11.90.0.31 |
| 52 |
+ )" |
| 53 |
+ RDEPEND="!build? ( |
| 54 |
+ >=sys-libs/ncurses-5.2 |
| 55 |
+ sys-devel/make |
| 56 |
+ dev-lang/perl |
| 57 |
+ sys-devel/bc |
| 58 |
+ )" |
| 59 |
PDEPEND="!build? ( virtual/dev-manager )" |
| 60 |
|
| 61 |
SLOT="${PVR}" |
| 62 |
@@ -851,8 +855,7 @@ |
| 63 |
KV_MINOR=$(get_version_component_range 2 ${OKV}) |
| 64 |
KV_PATCH=$(get_version_component_range 3 ${OKV}) |
| 65 |
if [[ "$(tc-arch)" = "sparc" ]]; then |
| 66 |
- if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]] |
| 67 |
- then |
| 68 |
+ if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]] ; then |
| 69 |
echo |
| 70 |
elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that" |
| 71 |
elog "you now need to do" |
| 72 |
@@ -938,7 +941,7 @@ |
| 73 |
xz) PIPE_CMD="xz -dc";; |
| 74 |
lzma) PIPE_CMD="lzma -dc";; |
| 75 |
bz2) PIPE_CMD="bzip2 -dc";; |
| 76 |
- patch*) PIPE_CMD="cat";; |
| 77 |
+ patch*) PIPE_CMD="cat";; |
| 78 |
diff) PIPE_CMD="cat";; |
| 79 |
gz|Z|z) PIPE_CMD="gzip -dc";; |
| 80 |
ZIP|zip) PIPE_CMD="unzip -p";; |
| 81 |
@@ -1205,8 +1208,7 @@ |
| 82 |
# fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox |
| 83 |
# only do this for kernel < 2.6.27 since this file does not exist in later |
| 84 |
# kernels |
| 85 |
- if [[ -n ${KV_MINOR} && ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]] |
| 86 |
- then |
| 87 |
+ if [[ -n ${KV_MINOR} && ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]] ; then |
| 88 |
sed -i \ |
| 89 |
-e 's|TOUT := .tmp_gas_check|TOUT := $(T).tmp_gas_check|' \ |
| 90 |
"${S}"/arch/ppc/Makefile |
Archives