[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/08/03 18:31:08

  Modified:             kernel-2.eclass
  Log:
  Bug #331013: avoid "make test" in kernel sources ebuilds.

Revision  Changes    Path
1.240                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.240&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.240&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.239&r2=1.240

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.239
retrieving revision 1.240
diff -p -w -b -B -u -u -r1.239 -r1.240
--- kernel-2.eclass	3 Aug 2010 17:22:13 -0000	1.239
+++ kernel-2.eclass	3 Aug 2010 18:31:08 -0000	1.240
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.239 2010/08/03 17:22:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.240 2010/08/03 18:31:08 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -68,7 +68,7 @@
 #						  order, so they are applied in the order passed
 
 inherit eutils toolchain-funcs versionator multilib
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst pkg_postinst
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_preinst pkg_postinst
 
 # Added by Daniel Ostrow <dostrow@gentoo.org>
 # This is an ugly hack to get around an issue with a 32-bit userland on ppc64.
@@ -1151,6 +1151,14 @@ kernel-2_src_compile() {
 	fi
 }
 
+# if you leave it to the default src_test, it will run make to
+# find whether test/check targets are present; since "make test"
+# actually produces a few support files, they are installed even
+# though the package is binchecks-restricted.
+#
+# Avoid this altogether by making the function moot.
+kernel-2_src_test() { :; }
+
 kernel-2_pkg_preinst() {
 	[[ ${ETYPE} == headers ]] && preinst_headers
 }

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     15/02/13 01:30:51

  Modified:             kernel-2.eclass
  Log:
  Handle cpu optimization patch for different gcc versions

Revision  Changes    Path
1.298                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.298&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.298&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.297&r2=1.298

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- kernel-2.eclass	28 Nov 2014 17:40:20 -0000	1.297
+++ kernel-2.eclass	13 Feb 2015 01:30:50 -0000	1.298
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.297 2014/11/28 17:40:20 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.298 2015/02/13 01:30:50 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -157,6 +157,16 @@
 			if use experimental ; then
 				UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"
 				debug-print "genpatches tarball: $tarball"
+
+				# check gcc version < 4.9.X uses patch 5000 and = 4.9.X uses patch 5010			
+				if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -ne 9 ]]; then
+						# drop 5000_enable-additional-cpu-optimizations-for-gcc-4.9.patch
+						UNIPATCH_EXCLUDE+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+				else
+					#drop 5000_enable-additional-cpu-optimizations-for-gcc.patch
+					UNIPATCH_EXCLUDE+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch"
+				fi
+
 			fi
 		else
 			UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      13/11/22 13:35:09

  Modified:             kernel-2.eclass
  Log:
  fix random style issues

Revision  Changes    Path
1.291                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.291&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.291&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.290&r2=1.291

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- kernel-2.eclass	18 Nov 2013 13:19:49 -0000	1.290
+++ kernel-2.eclass	22 Nov 2013 13:35:09 -0000	1.291
@@ -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.290 2013/11/18 13:19:49 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.291 2013/11/22 13:35:09 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -232,7 +232,7 @@
 	if [[ ${#OKV_ARRAY[@]} -lt 3 ]]; then
 		KV_PATCH_ARR=(${KV_PATCH//\./ })
 
-		# at this point 031412, Linus is putting all 3.x kernels in a 
+		# at this point 031412, Linus is putting all 3.x kernels in a
 		# 3.x directory, may need to revisit when 4.x is released
 		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x"
 
@@ -437,12 +437,16 @@
 
 # Capture the sources type and set DEPENDs
 if [[ ${ETYPE} == sources ]]; then
-	DEPEND="!build? ( sys-apps/sed
-					  >=sys-devel/binutils-2.11.90.0.31 )"
-	RDEPEND="!build? ( >=sys-libs/ncurses-5.2
-					   sys-devel/make 
-					   dev-lang/perl
-					   sys-devel/bc )"
+	DEPEND="!build? (
+		sys-apps/sed
+		>=sys-devel/binutils-2.11.90.0.31
+	)"
+	RDEPEND="!build? (
+		>=sys-libs/ncurses-5.2
+		sys-devel/make
+		dev-lang/perl
+		sys-devel/bc
+	)"
 	PDEPEND="!build? ( virtual/dev-manager )"
 
 	SLOT="${PVR}"
@@ -851,8 +855,7 @@
 	KV_MINOR=$(get_version_component_range 2 ${OKV})
 	KV_PATCH=$(get_version_component_range 3 ${OKV})
 	if [[ "$(tc-arch)" = "sparc" ]]; then
-		if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]]
-		then
+		if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]] ; then
 			echo
 			elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that"
 			elog "you now need to do"
@@ -938,7 +941,7 @@
 				     xz) PIPE_CMD="xz -dc";;
 				   lzma) PIPE_CMD="lzma -dc";;
 				    bz2) PIPE_CMD="bzip2 -dc";;
-				  patch*) PIPE_CMD="cat";;
+				 patch*) PIPE_CMD="cat";;
 				   diff) PIPE_CMD="cat";;
 				 gz|Z|z) PIPE_CMD="gzip -dc";;
 				ZIP|zip) PIPE_CMD="unzip -p";;
@@ -1205,8 +1208,7 @@
 	# fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox
 	# only do this for kernel < 2.6.27 since this file does not exist in later
 	# kernels
-	if [[ -n ${KV_MINOR} &&  ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]]
-	then
+	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|' \
 			"${S}"/arch/ppc/Makefile

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Julian Ospald (hasufell)]

hasufell    13/07/31 21:25:50

  Modified:             kernel-2.eclass
  Log:
  change "security wise" to "security-wise"

Revision  Changes    Path
1.287                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.287&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.287&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.286&r2=1.287

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -r1.286 -r1.287
--- kernel-2.eclass	31 Jul 2013 21:18:41 -0000	1.286
+++ kernel-2.eclass	31 Jul 2013 21:25:50 -0000	1.287
@@ -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.286 2013/07/31 21:18:41 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.287 2013/07/31 21:25:50 hasufell Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -814,7 +814,7 @@
 	# optionally display security unsupported message
 	#  Start with why
 	if [[ ${K_SECURITY_UNSUPPORTED} = deblob ]]; then
-		ewarn "Deblobbed kernels may not be up-to-date security wise"
+		ewarn "Deblobbed kernels may not be up-to-date security-wise"
 		ewarn "as they depend on external scripts."
 	elif [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
 		ewarn "${PN} is UNSUPPORTED by Gentoo Security."

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/10 07:57:59

  Modified:             kernel-2.eclass
  Log:
  do not reset S when we have already run through detect_version so it wont clobber an existing S value #380999

Revision  Changes    Path
1.272                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.272&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.272&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.271&r2=1.272

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- kernel-2.eclass	8 Dec 2011 19:39:44 -0000	1.271
+++ kernel-2.eclass	10 Dec 2011 07:57:59 -0000	1.272
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.271 2011/12/08 19:39:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.272 2011/12/10 07:57:59 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -146,14 +146,8 @@
 	# - KV: Kernel Version (2.6.0-gentoo/2.6.0-test11-gentoo-r1)
 	# - EXTRAVERSION: The additional version appended to OKV (-gentoo/-gentoo-r1)
 
-	if [[ -n ${KV_FULL} ]]; then
-		# we will set this for backwards compatibility.
-		KV=${KV_FULL}
-
-		# we know KV_FULL so lets stop here. but not without resetting S
-		S=${WORKDIR}/linux-${KV_FULL}
-		return
-	fi
+	# We've already run, so nothing to do here.
+	[[ -n ${KV_FULL} ]] && return 0
 
 	# CKV is used as a comparison kernel version, which is used when
 	# PV doesnt reflect the genuine kernel version.

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/08 19:39:44

  Modified:             kernel-2.eclass
  Log:
  omit the /usr/src/linux warning if nothing actually exists there

Revision  Changes    Path
1.271                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.271&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.271&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.270&r2=1.271

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- kernel-2.eclass	2 Dec 2011 04:34:59 -0000	1.270
+++ kernel-2.eclass	8 Dec 2011 19:39:44 -0000	1.271
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.270 2011/12/02 04:34:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.271 2011/12/08 19:39:44 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -1222,6 +1222,9 @@
 kernel-2_pkg_postrm() {
 	# This warning only makes sense for kernel sources.
 	[[ ${ETYPE} == headers ]] && return 0
+
+	# If there isn't anything left behind, then don't complain.
+	[[ -e ${ROOT}usr/src/linux-${KV_FULL} ]] || return 0
 	echo
 	ewarn "Note: Even though you have successfully unmerged "
 	ewarn "your kernel package, directories in kernel source location: "

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/02 04:34:59

  Modified:             kernel-2.eclass
  Log:
  previous commit inverted the tested values

Revision  Changes    Path
1.270                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.270&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.270&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.269&r2=1.270

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- kernel-2.eclass	2 Dec 2011 04:19:45 -0000	1.269
+++ kernel-2.eclass	2 Dec 2011 04:34:59 -0000	1.270
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.269 2011/12/02 04:19:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.270 2011/12/02 04:34:59 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -406,8 +406,8 @@
 	esac
 	[[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters"
 
-	: $(( value = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
-	: $(( test = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} ))
+	: $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
+	: $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} ))
 	[ ${test} ${operator} ${value} ]
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/02 04:19:45

  Modified:             kernel-2.eclass
  Log:
  simplify kernel_is logic

Revision  Changes    Path
1.269                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.269&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.269&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.268&r2=1.269

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- kernel-2.eclass	2 Dec 2011 02:37:50 -0000	1.268
+++ kernel-2.eclass	2 Dec 2011 04:19:45 -0000	1.269
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.268 2011/12/02 02:37:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.269 2011/12/02 04:19:45 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -394,9 +394,9 @@
 	unset v n
 
 	# Now we can continue
-	local operator test value x=0 y=0 z=0
+	local operator test value
 
-	case ${1} in
+	case $1 in
 	  lt) operator="-lt"; shift;;
 	  gt) operator="-gt"; shift;;
 	  le) operator="-le"; shift;;
@@ -404,24 +404,11 @@
 	  eq) operator="-eq"; shift;;
 	   *) operator="-eq";;
 	esac
+	[[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters"
 
-	for x in ${@}; do
-		for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done
-		value="${value}${x}"
-		z=$((${z} + 1))
-
-		case ${z} in
-		  1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do test="${test}0"; done;
-			 test="${test}${KV_MAJOR}";;
-		  2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do test="${test}0"; done;
-			 test="${test}${KV_MINOR}";;
-		  3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do test="${test}0"; done;
-			 test="${test}${KV_PATCH}";;
-		  *) die "Error in kernel-2_kernel_is(): Too many parameters.";;
-		esac
-	done
-
-	[ ${test} ${operator} ${value} ] && return 0 || return 1
+	: $(( value = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
+	: $(( test = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} ))
+	[ ${test} ${operator} ${value} ]
 }
 
 kernel_is_2_4() {

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/02 02:37:50

  Modified:             kernel-2.eclass
  Log:
  delete unsed generate_sparc_asm helper

Revision  Changes    Path
1.268                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.268&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.268&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.267&r2=1.268

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- kernel-2.eclass	2 Dec 2011 02:28:16 -0000	1.267
+++ kernel-2.eclass	2 Dec 2011 02:37:50 -0000	1.268
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.267 2011/12/02 02:28:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.268 2011/12/02 02:37:50 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -1124,67 +1124,6 @@
 	done
 }
 
-# sparc nastiness
-#==============================================================
-# This script generates the files in /usr/include/asm for sparc systems
-# during installation of sys-kernel/linux-headers.
-# Will no longer be needed when full 64 bit support is used on sparc64
-# systems.
-#
-# Shamefully ripped from Debian
-# ----------------------------------------------------------------------
-
-# Idea borrowed from RedHat's kernel package
-
-# This is gonna get replaced by something in multilib.eclass soon...
-# --eradicator
-generate_sparc_asm() {
-	local name
-
-	cd $1 || die
-	mkdir asm
-
-	for h in `( ls asm-sparc; ls asm-sparc64 ) | grep '\.h$' | sort -u`; do
-		name="$(echo $h | tr a-z. A-Z_)"
-		# common header
-		echo "/* All asm/ files are generated and point to the corresponding
- * file in asm-sparc or asm-sparc64.
- */
-
-#ifndef __SPARCSTUB__${name}__
-#define __SPARCSTUB__${name}__
-" > asm/${h}
-
-		# common for sparc and sparc64
-		if [ -f asm-sparc/$h -a -f asm-sparc64/$h ]; then
-			echo "#ifdef __arch64__
-#include <asm-sparc64/$h>
-#else
-#include <asm-sparc/$h>
-#endif
-" >> asm/${h}
-
-		# sparc only
-		elif [ -f asm-sparc/$h ]; then
-echo "#ifndef __arch64__
-#include <asm-sparc/$h>
-#endif
-" >> asm/${h}
-
-		# sparc64 only
-		else
-echo "#ifdef __arch64__
-#include <asm-sparc64/$h>
-#endif
-" >> asm/${h}
-		fi
-
-		# common footer
-		echo "#endif /* !__SPARCSTUB__${name}__ */" >> asm/${h}
-	done
-	return 0
-}
-
 headers___fix() {
 	# Voodoo to partially fix broken upstream headers.
 	# note: do not put inline/asm/volatile together (breaks "inline asm volatile")

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/02 02:28:16

  Modified:             kernel-2.eclass
  Log:
  simplify default variable setup

Revision  Changes    Path
1.267                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.267&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.267&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.266&r2=1.267

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- kernel-2.eclass	2 Dec 2011 01:54:09 -0000	1.266
+++ kernel-2.eclass	2 Dec 2011 02:28:16 -0000	1.267
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.266 2011/12/02 01:54:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.267 2011/12/02 02:28:16 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -83,20 +83,18 @@
 fi
 
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ ${HOMEPAGE}"
-[[ -z ${LICENSE} ]] && \
-	LICENSE="GPL-2"
+: ${LICENSE:="GPL-2"}
 
 # This is the latest KV_PATCH of the deblob tool available from the
 # libre-sources upstream. If you bump this, you MUST regenerate the Manifests
 # for ALL kernel-2 consumer packages where deblob is available.
-[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=38
+: ${DEBLOB_MAX_VERSION:=38}
 
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"
 
 # set LINUX_HOSTCFLAGS if not already set
-[[ -z ${LINUX_HOSTCFLAGS} ]] && \
-	LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"
+: ${LINUX_HOSTCFLAGS:="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"}
 
 # debugging functions
 #==============================================================

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/02 01:54:09

  Modified:             kernel-2.eclass
  Log:
  use `read` to simplify the creation of an array from a string

Revision  Changes    Path
1.266                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.266&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.266&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.265&r2=1.266

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- kernel-2.eclass	2 Dec 2011 00:15:46 -0000	1.265
+++ kernel-2.eclass	2 Dec 2011 01:54:09 -0000	1.266
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.265 2011/12/02 00:15:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.266 2011/12/02 01:54:09 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -118,10 +118,8 @@
 	[[ -z ${K_WANT_GENPATCHES} || -z ${K_GENPATCHES_VER} ]] && return 1
 
 	debug-print "Inside handle_genpatches"
-	local oldifs=${IFS}
-	export IFS="."
-	local OKV_ARRAY=( $OKV )
-	export IFS=${oldifs}
+	local OKV_ARRAY
+	IFS="." read -r -a OKV_ARRAY <<<"${OKV}"
 
 	# for > 3.0 kernels, handle genpatches tarball name
 	# genpatches for 3.0 and 3.0.1 might be named
@@ -172,10 +170,8 @@
 
 	KV_MAJOR=$(get_version_component_range 1 ${OKV})
 	# handle if OKV is X.Y or X.Y.Z (e.g. 3.0 or 3.0.1)
-	local oldifs=${IFS}
-	export IFS="."
-	local OKV_ARRAY=( $OKV )
-	export IFS=${oldifs}
+	local OKV_ARRAY
+	IFS="." read -r -a OKV_ARRAY <<<"${OKV}"
 
 	# if KV_MAJOR >= 3, then we have no more KV_MINOR
 	#if [[ ${KV_MAJOR} -lt 3 ]]; then
@@ -572,10 +568,8 @@
 universal_unpack() {
 	debug-print "Inside universal_unpack"
 
-	local oldifs=${IFS}
-	export IFS="."
-	local OKV_ARRAY=( $OKV )
-	export IFS=${oldifs}
+	local OKV_ARRAY
+	IFS="." read -r -a OKV_ARRAY <<<"${OKV}"
 
 	cd "${WORKDIR}"
 	if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/02 00:15:47

  Modified:             kernel-2.eclass
  Log:
  simplify SLOT for cross-compiling ... this was a hold over from long ago when i tried doing cross-compiler packages in the same CATEGORY and only differentiate by SLOT (which portage hates a lot when $P is the same)

Revision  Changes    Path
1.265                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.265&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.265&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.264&r2=1.265

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- kernel-2.eclass	1 Dec 2011 23:34:18 -0000	1.264
+++ kernel-2.eclass	2 Dec 2011 00:15:46 -0000	1.265
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.264 2011/12/01 23:34:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.265 2011/12/02 00:15:46 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -504,11 +504,7 @@
 	# lets unset it here.
 	unset KBUILD_OUTPUT
 
-	if [[ ${CTARGET} = ${CHOST} ]]; then
-		SLOT="0"
-	else
-		SLOT="${CTARGET}"
-	fi
+	SLOT="0"
 else
 	eerror "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""
 	die "Unknown ETYPE=\"${ETYPE}\", must be \"sources\" or \"headers\""

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/01 23:34:18

  Modified:             kernel-2.eclass
  Log:
  convert linux-2.4/gcc-4 check to gcc-4+

Revision  Changes    Path
1.264                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.264&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.264&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.263&r2=1.264

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- kernel-2.eclass	1 Dec 2011 23:32:41 -0000	1.263
+++ kernel-2.eclass	1 Dec 2011 23:34:18 -0000	1.264
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.263 2011/12/01 23:32:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.264 2011/12/01 23:34:18 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -1287,7 +1287,7 @@
 
 kernel-2_pkg_setup() {
 	if kernel_is 2 4; then
-		if [ "$( gcc-major-version )" -eq "4" ] ; then
+		if [[ $(gcc-major-version) -ge 4 ]] ; then
 			echo
 			ewarn "Be warned !! >=sys-devel/gcc-4.0.0 isn't supported with linux-2.4!"
 			ewarn "Either switch to another gcc-version (via gcc-config) or use a"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/12/01 23:32:41

  Modified:             kernel-2.eclass
  Log:
  do not warn about /usr/src/linux cruft when installing kernel headers

Revision  Changes    Path
1.263                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.263&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.263&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.262&r2=1.263

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- kernel-2.eclass	8 Nov 2011 01:05:22 -0000	1.262
+++ kernel-2.eclass	1 Dec 2011 23:32:41 -0000	1.263
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.262 2011/11/08 01:05:22 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.263 2011/12/01 23:32:41 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -1306,6 +1306,8 @@
 }
 
 kernel-2_pkg_postrm() {
+	# This warning only makes sense for kernel sources.
+	[[ ${ETYPE} == headers ]] && return 0
 	echo
 	ewarn "Note: Even though you have successfully unmerged "
 	ewarn "your kernel package, directories in kernel source location: "
@@ -1314,4 +1316,3 @@
 	ewarn "will not remove these modified files and the directories they reside in."
 	echo
 }
-

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/10/24 23:58:11

  Modified:             kernel-2.eclass
  Log:
  Upstream now has 3.x tarballs in a directory called 3.x. Look for tarballs in this directory

Revision  Changes    Path
1.261                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.261&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.261&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.260&r2=1.261

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- kernel-2.eclass	29 Aug 2011 01:28:10 -0000	1.260
+++ kernel-2.eclass	24 Oct 2011 23:58:11 -0000	1.261
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.260 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.261 2011/10/24 23:58:11 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -231,7 +231,8 @@
 			KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_PATCH_ARR}"
 	else
 		#KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.0"
-		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
+		#KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
+		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x"
 		[[ -n "${K_LONGTERM}" ]] &&
 			KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/08/19 13:26:12

  Modified:             kernel-2.eclass
  Log:
  eclass updates to fix UNIPATCH_LIST_DEFAULT for kernels based on vanilla

Revision  Changes    Path
1.259                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.259&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.259&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.258&r2=1.259

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- kernel-2.eclass	18 Aug 2011 14:58:57 -0000	1.258
+++ kernel-2.eclass	19 Aug 2011 13:26:12 -0000	1.259
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.258 2011/08/18 14:58:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.259 2011/08/19 13:26:12 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -106,7 +106,7 @@
 debug-print-kernel2-variables() {
 	for v in PVR CKV OKV KV KV_FULL KV_MAJOR KV_MINOR KV_PATCH RELEASETYPE \
 			RELEASE UNIPATCH_LIST_DEFAULT UNIPATCH_LIST_GENPATCHES \
-			UNIPATCH_LIST S KERNEL_URI ; do
+			UNIPATCH_LIST S KERNEL_URI K_WANT_GENPATCHES ; do
 		debug-print "${v}: ${!v}"
 	done
 }
@@ -220,7 +220,7 @@
 		KV_PATCH_ARR=(${KV_PATCH//\./ })
 
 		# at this point 080811, Linus is putting 3.1 kernels in 3.0 directory
-		# revisit when 3.1 is released
+		# revisit when 3.1 is released 
 		if [[ ${KV_PATCH} -gt 0 ]]; then
 			KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"
 		else
@@ -239,8 +239,8 @@
 	debug-print "KERNEL_BASE_URI is ${KERNEL_BASE_URI}"
 
 	if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then
-		# handle vanilla-sources-3.x.y correctly
-		if [[ ${PN/-*} == "vanilla" && ${KV_PATCH} -gt 0 ]]; then
+		# handle non genpatch using sources correctly
+		if [[ -z ${K_WANT_GENPATCHES} && -z ${K_GENPATCHES_VER} && ${KV_PATCH} -gt 0 ]]; then
 			KERNEL_URI="${KERNEL_BASE_URI}/patch-${OKV}.bz2"
 			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2"
 		fi

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/08/15 21:38:33

  Modified:             kernel-2.eclass
  Log:
  Fix for 2.6.X KERNEL_BASE_URI, thanks to lxnay.

Revision  Changes    Path
1.257                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.257&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.257&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.256&r2=1.257

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- kernel-2.eclass	11 Aug 2011 14:09:56 -0000	1.256
+++ kernel-2.eclass	15 Aug 2011 21:38:33 -0000	1.257
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.256 2011/08/11 14:09:56 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.257 2011/08/15 21:38:33 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -230,12 +230,14 @@
 		[[ -n "${K_LONGTERM}" ]] &&
 			KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_PATCH_ARR}"
 	else
-		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.0"
-		#KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
+		#KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.0"
+		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
 		[[ -n "${K_LONGTERM}" ]] &&
 			KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
 	fi
 
+	debug-print "KERNEL_BASE_URI is ${KERNEL_BASE_URI}"
+
 	if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then
 		# handle vanilla-sources-3.x.y correctly
 		if [[ ${PN/-*} == "vanilla" && ${KV_PATCH} -gt 0 ]]; then

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/08/11 14:09:56

  Modified:             kernel-2.eclass
  Log:
  Add message in pkg_postrm to inform user that modified kernel source is not cleaned up by package manager. Bug #378611

Revision  Changes    Path
1.256                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.256&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.256&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.255&r2=1.256

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- kernel-2.eclass	8 Aug 2011 23:14:56 -0000	1.255
+++ kernel-2.eclass	11 Aug 2011 14:09:56 -0000	1.256
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.255 2011/08/08 23:14:56 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.256 2011/08/11 14:09:56 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -70,7 +70,7 @@
 #						  order, so they are applied in the order passed
 
 inherit eutils toolchain-funcs versionator multilib
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_preinst pkg_postinst
+EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
 
 # Added by Daniel Ostrow <dostrow@gentoo.org>
 # This is an ugly hack to get around an issue with a 32-bit userland on ppc64.
@@ -1295,3 +1295,14 @@
 	[[ ${ETYPE} == headers ]] && setup_headers
 	[[ ${ETYPE} == sources ]] && echo ">>> Preparing to unpack ..."
 }
+
+kernel-2_pkg_postrm() {
+	echo
+	ewarn "Note: Even though you have successfully unmerged "
+	ewarn "your kernel package, directories in kernel source location: "
+	ewarn "${ROOT}usr/src/linux-${KV_FULL}"
+	ewarn "with modified files will remain behind. By design, package managers"
+	ewarn "will not remove these modified files and the directories they reside in."
+	echo
+}
+

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/08/08 23:14:56

  Modified:             kernel-2.eclass
  Log:
  Deblob support for 3.X kernels updated

Revision  Changes    Path
1.255                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.255&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.255&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.254&r2=1.255

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- kernel-2.eclass	8 Aug 2011 14:14:15 -0000	1.254
+++ kernel-2.eclass	8 Aug 2011 23:14:56 -0000	1.255
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.254 2011/08/08 14:14:15 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.255 2011/08/08 23:14:56 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -460,6 +460,10 @@
 				DEBLOB_PV="${KV_MAJOR}.${KV_PATCH}"
 			fi
 
+			if [[ ${KV_MAJOR} -ge 3 ]]; then
+				DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}"
+			fi
+
 			DEBLOB_A="deblob-${DEBLOB_PV}"
 			DEBLOB_CHECK_A="deblob-check-${DEBLOB_PV}"
 			DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/08/08 14:14:15

  Modified:             kernel-2.eclass
  Log:
  Changes to handle_genpatches for 3.X kernels and chanegs for 3.1 kernels to keep up with Linus' decisions

Revision  Changes    Path
1.254                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.254&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.254&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.253&r2=1.254

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- kernel-2.eclass	3 Jun 2011 20:20:23 -0000	1.253
+++ kernel-2.eclass	8 Aug 2011 14:14:15 -0000	1.254
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.253 2011/06/03 20:20:23 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.254 2011/08/08 14:14:15 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -117,10 +117,30 @@
 	local tarball
 	[[ -z ${K_WANT_GENPATCHES} || -z ${K_GENPATCHES_VER} ]] && return 1
 
+	debug-print "Inside handle_genpatches"
+	local oldifs=${IFS}
+	export IFS="."
+	local OKV_ARRAY=( $OKV )
+	export IFS=${oldifs}
+
+	# for > 3.0 kernels, handle genpatches tarball name
+	# genpatches for 3.0 and 3.0.1 might be named
+	# genpatches-3.0-1.base.tar.bz2 and genpatches-3.0-2.base.tar.bz2
+	# respectively.  Handle this.
+
 	for i in ${K_WANT_GENPATCHES} ; do
+	if [[ ${KV_MAJOR} -ge 3 ]]; then
+		if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
+			tarball="genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.bz2"
+		else
+			tarball="genpatches-${KV_MAJOR}.${KV_PATCH}-${K_GENPATCHES_VER}.${i}.tar.bz2"
+		fi
+	else
 		tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.bz2"
-		GENPATCHES_URI="${GENPATCHES_URI} mirror://gentoo/${tarball}"
-		UNIPATCH_LIST_GENPATCHES="${UNIPATCH_LIST_GENPATCHES} ${DISTDIR}/${tarball}"
+	fi
+	debug-print "genpatches tarball: $tarball"
+	GENPATCHES_URI="${GENPATCHES_URI} mirror://gentoo/${tarball}"
+	UNIPATCH_LIST_GENPATCHES="${UNIPATCH_LIST_GENPATCHES} ${DISTDIR}/${tarball}"
 	done
 }
 
@@ -151,9 +171,15 @@
 	OKV=${OKV/_p*}
 
 	KV_MAJOR=$(get_version_component_range 1 ${OKV})
+	# handle if OKV is X.Y or X.Y.Z (e.g. 3.0 or 3.0.1)
+	local oldifs=${IFS}
+	export IFS="."
+	local OKV_ARRAY=( $OKV )
+	export IFS=${oldifs}
 
 	# if KV_MAJOR >= 3, then we have no more KV_MINOR
-	if [[ ${KV_MAJOR} -lt 3 ]]; then
+	#if [[ ${KV_MAJOR} -lt 3 ]]; then
+	if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
 		KV_MINOR=$(get_version_component_range 2 ${OKV})
 		KV_PATCH=$(get_version_component_range 3 ${OKV})
 		if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then
@@ -168,10 +194,13 @@
 		KV_EXTRA=${KV_EXTRA/[-_]*}
 	fi
 
+	debug-print "KV_EXTRA is ${KV_EXTRA}"
+
 	KV_PATCH=${KV_PATCH/[-_]*}
 
 	local v n=0 missing
-	if [[ ${KV_MAJOR} -lt 3 ]]; then
+	#if [[ ${KV_MAJOR} -lt 3 ]]; then
+	if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then
 		for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do
 			[[ -z ${!v} ]] && n=1 && missing="${missing}${v} ";
 		done
@@ -186,18 +215,37 @@
 		die "Failed to extract kernel version (try explicit CKV in ebuild)!"
 	unset v n missing
 
-	if [[ ${KV_MAJOR} -ge 3 ]]; then
+#	if [[ ${KV_MAJOR} -ge 3 ]]; then
+	if [[ ${#OKV_ARRAY[@]} -lt 3 ]]; then
 		KV_PATCH_ARR=(${KV_PATCH//\./ })
-		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_PATCH_ARR}"
+
+		# at this point 080811, Linus is putting 3.1 kernels in 3.0 directory
+		# revisit when 3.1 is released 
+		if [[ ${KV_PATCH} -gt 0 ]]; then
+			KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"
+		else
+			KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_PATCH_ARR}"
+		fi
+		# KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_PATCH_ARR}"
 		[[ -n "${K_LONGTERM}" ]] &&
 			KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_PATCH_ARR}"
 	else
-		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
+		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.0"
+		#KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
 		[[ -n "${K_LONGTERM}" ]] &&
 			KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
 	fi
 
-	KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
+	if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then
+		# handle vanilla-sources-3.x.y correctly
+		if [[ ${PN/-*} == "vanilla" && ${KV_PATCH} -gt 0 ]]; then
+			KERNEL_URI="${KERNEL_BASE_URI}/patch-${OKV}.bz2"
+			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2"
+		fi
+		KERNEL_URI="${KERNEL_URI} ${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.bz2"
+	else
+		KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
+	fi
 
 	RELEASE=${CKV/${OKV}}
 	RELEASE=${RELEASE/_beta}
@@ -215,7 +263,7 @@
 	# first of all, we add the release
 	EXTRAVERSION="${RELEASE}"
 	debug-print "0 EXTRAVERSION:${EXTRAVERSION}"
-	[[ -n ${KV_EXTRA} ]] && EXTRAVERSION=".${KV_EXTRA}${EXTRAVERSION}"
+	[[ -n ${KV_EXTRA} ]] && [[ ${KV_MAJOR} -lt 3 ]] && EXTRAVERSION=".${KV_EXTRA}${EXTRAVERSION}"
 
 	debug-print "1 EXTRAVERSION:${EXTRAVERSION}"
 	if [[ -n "${K_NOUSEPR}" ]]; then
@@ -513,13 +561,37 @@
 }
 
 universal_unpack() {
+	debug-print "Inside universal_unpack"
+
+	local oldifs=${IFS}
+	export IFS="."
+	local OKV_ARRAY=( $OKV )
+	export IFS=${oldifs}
+
 	cd "${WORKDIR}"
-	unpack linux-${OKV}.tar.bz2
+	if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then
+		unpack linux-${KV_MAJOR}.${KV_MINOR}.tar.bz2
+	else
+		unpack linux-${OKV}.tar.bz2
+	fi
+
 	if [[ -d "linux" ]]; then
+		debug-print "Moving linux to linux-${KV_FULL}"
 		mv linux linux-${KV_FULL} \
 			|| die "Unable to move source tree to ${KV_FULL}."
 	elif [[ "${OKV}" != "${KV_FULL}" ]]; then
-		mv linux-${OKV} linux-${KV_FULL} \
+		if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]] &&
+			[[ "${ETYPE}" = "sources" ]]; then
+			debug-print "moving linux-${KV_MAJOR}.${KV_MINOR} to linux-${KV_FULL} "
+			mv linux-${KV_MAJOR}.${KV_MINOR} linux-${KV_FULL} \
+				|| die "Unable to move source tree to ${KV_FULL}."
+		else
+			debug-print "moving linux-${OKV} to linux-${KV_FULL} "
+			mv linux-${OKV} linux-${KV_FULL} \
+				|| die "Unable to move source tree to ${KV_FULL}."
+		fi
+	elif [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then
+		mv linux-${KV_MAJOR}.${KV_MINOR} linux-${KV_FULL} \
 			|| die "Unable to move source tree to ${KV_FULL}."
 	fi
 	cd "${S}"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/06/03 20:20:23

  Modified:             kernel-2.eclass
  Log:
  Fix typo when getting KV_MINOR. Thanks to hwoarang for reporting

Revision  Changes    Path
1.253                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.253&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.253&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.252&r2=1.253

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- kernel-2.eclass	3 Jun 2011 13:07:33 -0000	1.252
+++ kernel-2.eclass	3 Jun 2011 20:20:23 -0000	1.253
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.252 2011/06/03 13:07:33 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.253 2011/06/03 20:20:23 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -154,7 +154,7 @@
 
 	# if KV_MAJOR >= 3, then we have no more KV_MINOR
 	if [[ ${KV_MAJOR} -lt 3 ]]; then
-		KV_MINOR=$(get_version_component_range 2 )
+		KV_MINOR=$(get_version_component_range 2 ${OKV})
 		KV_PATCH=$(get_version_component_range 3 ${OKV})
 		if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then
 	        KV_EXTRA=$(get_version_component_range 4- ${OKV})

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/06/03 13:07:33

  Modified:             kernel-2.eclass
  Log:
  Add support for 2 part versioning. bug #369533

Revision  Changes    Path
1.252                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.252&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.252&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.251&r2=1.252

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- kernel-2.eclass	30 Apr 2011 17:07:50 -0000	1.251
+++ kernel-2.eclass	3 Jun 2011 13:07:33 -0000	1.252
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.251 2011/04/30 17:07:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.252 2011/06/03 13:07:33 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -151,29 +151,51 @@
 	OKV=${OKV/_p*}
 
 	KV_MAJOR=$(get_version_component_range 1 ${OKV})
-	KV_MINOR=$(get_version_component_range 2 ${OKV})
-	KV_PATCH=$(get_version_component_range 3 ${OKV})
 
-	if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then
-		KV_EXTRA=$(get_version_component_range 4- ${OKV})
-		KV_EXTRA=${KV_EXTRA/[-_]*}
+	# if KV_MAJOR >= 3, then we have no more KV_MINOR
+	if [[ ${KV_MAJOR} -lt 3 ]]; then
+		KV_MINOR=$(get_version_component_range 2 )
+		KV_PATCH=$(get_version_component_range 3 ${OKV})
+		if [[ ${KV_MAJOR}${KV_MINOR}${KV_PATCH} -ge 269 ]]; then
+	        KV_EXTRA=$(get_version_component_range 4- ${OKV})
+	        KV_EXTRA=${KV_EXTRA/[-_]*}
+		else
+			KV_PATCH=$(get_version_component_range 3- ${OKV})
+		fi
 	else
-		KV_PATCH=$(get_version_component_range 3- ${OKV})
+		KV_PATCH=$(get_version_component_range 2 ${OKV})
+		KV_EXTRA=$(get_version_component_range 3- ${OKV})
+		KV_EXTRA=${KV_EXTRA/[-_]*}
 	fi
+
 	KV_PATCH=${KV_PATCH/[-_]*}
 
 	local v n=0 missing
-	for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do
-		[[ -z ${!v} ]] && n=1 && missing="${missing}${v} ";
-	done
+	if [[ ${KV_MAJOR} -lt 3 ]]; then
+		for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do
+			[[ -z ${!v} ]] && n=1 && missing="${missing}${v} ";
+		done
+	else
+		for v in CKV OKV KV_{MAJOR,PATCH} ; do
+			[[ -z ${!v} ]] && n=1 && missing="${missing}${v} ";
+		done
+	fi
+
 	[[ $n -eq 1 ]] && \
 		eerror "Missing variables: ${missing}" && \
 		die "Failed to extract kernel version (try explicit CKV in ebuild)!"
 	unset v n missing
 
-	KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
-	[[ -n "${K_LONGTERM}" ]] &&
-		KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+	if [[ ${KV_MAJOR} -ge 3 ]]; then
+		KV_PATCH_ARR=(${KV_PATCH//\./ })
+		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_PATCH_ARR}"
+		[[ -n "${K_LONGTERM}" ]] &&
+			KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_PATCH_ARR}"
+	else
+		KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
+		[[ -n "${K_LONGTERM}" ]] &&
+			KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+	fi
 
 	KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 
@@ -184,7 +206,7 @@
 	# We cannot trivally call kernel_is here, because it calls us to detect the
 	# version
 	#kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git}
-	[ $(($KV_MAJOR * 1000 + $KV_MINOR)) -ge 2006 ] && RELEASE=${RELEASE/-pre/-git}
+	[ $(($KV_MAJOR * 1000 + ${KV_MINOR:-0})) -ge 2006 ] && RELEASE=${RELEASE/-pre/-git}
 	RELEASETYPE=${RELEASE//[0-9]}
 
 	# Now we know that RELEASE is the -rc/-git
@@ -221,8 +243,13 @@
 	# The only messing around which should actually effect this is for KV_EXTRA
 	# since this has to limit OKV to MAJ.MIN.PAT and strip EXTRA off else
 	# KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION
+
 	if [[ -n ${KV_EXTRA} ]]; then
-		OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+		if [[ -n ${KV_MINOR} ]]; then
+			OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+		else
+			OKV="${KV_MAJOR}.${KV_PATCH}"
+		fi
 		KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.bz2
 					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2"
@@ -242,28 +269,66 @@
 	# will pull:
 	#   linux-2.6.10.tar.bz2 & patch-2.6.11-rc3.bz2 & patch-2.6.11-rc3-git2.bz2
 
-	if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
-		OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
-		KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2
-					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
-		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2"
-	fi
+	if [[ ${KV_MAJOR}${KV_MINOR} -eq 26 ]]; then
 
-	if [[ ${RELEASETYPE} == -git ]]; then
-		KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2
-					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
-		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2"
-	fi
+		if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
+			OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
+			KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2
+						${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
+			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2"
+		fi
+
+		if [[ ${RELEASETYPE} == -git ]]; then
+			KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2
+						${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
+			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2"
+		fi
+
+		if [[ ${RELEASETYPE} == -rc-git ]]; then
+			OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
+			KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2
+						${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2
+						${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
+
+			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2"
+		fi
+	else
+		if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
+			if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then
+				OKV="2.6.39"
+			else
+				KV_PATCH_ARR=(${KV_PATCH//\./ })
+				OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"
+			fi
+			KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2
+						${KERNEL_BASE_URI}/testing/linux-${OKV}.tar.bz2"
+			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2"
+		fi
+
+		if [[ ${RELEASETYPE} == -git ]]; then
+			KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2
+						${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
+			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2"
+		fi
+
+		if [[ ${RELEASETYPE} == -rc-git ]]; then
+			if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then
+				OKV="2.6.39"
+			else
+				KV_PATCH_ARR=(${KV_PATCH//\./ })
+				OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"
+			fi
+			KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.bz2
+						${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.bz2
+						${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
+
+			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.bz2"
+		fi
 
-	if [[ ${RELEASETYPE} == -rc-git ]]; then
-		OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
-		KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2
-					${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2
-					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 
-		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2"
 	fi
 
+
 	debug-print-kernel2-variables
 
 	handle_genpatches
@@ -325,7 +390,7 @@
 	PDEPEND="!build? ( virtual/dev-manager )"
 
 	SLOT="${PVR}"
-	DESCRIPTION="Sources for the ${KV_MAJOR}.${KV_MINOR} linux kernel"
+	DESCRIPTION="Sources for the ${KV_MAJOR}.${KV_MINOR:-$KV_PATCH} linux kernel"
 	IUSE="symlink build"
 
 	# Bug #266157, deblob for libre support
@@ -341,7 +406,12 @@
 			# stripped
 			LICENSE="${LICENSE} !deblob? ( freedist )"
 
-			DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+			if [[ -n KV_MINOR ]]; then
+				DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+			else
+				DEBLOB_PV="${KV_MAJOR}.${KV_PATCH}"
+			fi
+
 			DEBLOB_A="deblob-${DEBLOB_PV}"
 			DEBLOB_CHECK_A="deblob-check-${DEBLOB_PV}"
 			DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
@@ -460,7 +530,7 @@
 	# fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox
 	# only do this for kernel < 2.6.27 since this file does not exist in later
 	# kernels
-	if [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]]
+	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|' \
@@ -708,18 +778,19 @@
 	KV_MAJOR=$(get_version_component_range 1 ${OKV})
 	KV_MINOR=$(get_version_component_range 2 ${OKV})
 	KV_PATCH=$(get_version_component_range 3 ${OKV})
-	if [[ "$(tc-arch)" = "sparc" ]] \
-		&& [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]]
-	then
-		echo
-		elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that"
-		elog "you now need to do"
-		elog "  make CROSS_COMPILE=sparc64-unknown-linux-gnu-"
-		elog "instead of just"
-		elog "  make"
-		elog "to compile the kernel. For more information please browse to"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=214765"
-		echo
+	if [[ "$(tc-arch)" = "sparc" ]]; then
+		if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]]
+		then
+			echo
+			elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that"
+			elog "you now need to do"
+			elog "  make CROSS_COMPILE=sparc64-unknown-linux-gnu-"
+			elog "instead of just"
+			elog "  make"
+			elog "to compile the kernel. For more information please browse to"
+			elog "https://bugs.gentoo.org/show_bug.cgi?id=214765"
+			echo
+		fi
 	fi
 }
 
@@ -844,7 +915,7 @@
 	# do not apply fbcondecor patch to sparc/sparc64 as it breaks boot
 	# bug #272676
 	if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then
-		if [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.28 ]]; then
+		if [[ ${KV_MAJOR} -ge 3 || ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.28 ]]; then
 			UNIPATCH_DROP="${UNIPATCH_DROP} *_fbcondecor-0.9.6.patch"
 			echo
 			ewarn "fbcondecor currently prevents sparc/sparc64 from booting"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Ulrich Mueller (ulm)]

ulm         11/04/30 17:07:50

  Modified:             kernel-2.eclass
  Log:
  Don't PROVIDE virtual/linux-sources, it is a new-style virtual now, bug 118442.

Revision  Changes    Path
1.251                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.251&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.251&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.250&r2=1.251

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- kernel-2.eclass	21 Apr 2011 12:34:39 -0000	1.250
+++ kernel-2.eclass	30 Apr 2011 17:07:50 -0000	1.251
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.250 2011/04/21 12:34:39 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.251 2011/04/30 17:07:50 ulm Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -324,8 +324,6 @@
 					   sys-devel/make )"
 	PDEPEND="!build? ( virtual/dev-manager )"
 
-	PROVIDE="virtual/linux-sources"
-
 	SLOT="${PVR}"
 	DESCRIPTION="Sources for the ${KV_MAJOR}.${KV_MINOR} linux kernel"
 	IUSE="symlink build"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/04/21 12:34:39

  Modified:             kernel-2.eclass
  Log:
  deblob fix for bug #359865 thanks too Johnny

Revision  Changes    Path
1.250                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.250&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.250&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.249&r2=1.250

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- kernel-2.eclass	14 Apr 2011 06:10:32 -0000	1.249
+++ kernel-2.eclass	21 Apr 2011 12:34:39 -0000	1.250
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.249 2011/04/14 06:10:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.250 2011/04/21 12:34:39 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -332,11 +332,11 @@
 
 	# Bug #266157, deblob for libre support
 	if [[ -z ${K_PREDEBLOBBED} ]] ; then
-		if [[ -z ${K_DEBLOB_AVAILABLE} ]] ; then
-			kernel_is ge 2 6 27 && \
+		# Bug #359865, force a call to detect_version if needed
+		kernel_is ge 2 6 27 && \
+			[[ -z "${K_DEBLOB_AVAILABLE}" ]] && \
 				kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \
-				K_DEBLOB_AVAILABLE=1
-		fi
+					K_DEBLOB_AVAILABLE=1
 		if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then
 			IUSE="${IUSE} deblob"
 			# Reflect that kernels contain firmware blobs unless otherwise

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Ulrich Mueller (ulm)]

ulm         11/04/14 06:10:32

  Modified:             kernel-2.eclass
  Log:
  Don't PROVIDE virtual/os-headers, it is a new-style virtual now, bug 358999.
  Fix whitespace.

Revision  Changes    Path
1.249                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.249&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.249&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.248&r2=1.249

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- kernel-2.eclass	22 Mar 2011 00:39:09 -0000	1.248
+++ kernel-2.eclass	14 Apr 2011 06:10:32 -0000	1.249
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.248 2011/03/22 00:39:09 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.249 2011/04/14 06:10:32 ulm Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -53,7 +53,7 @@
 #						  or the license will note the inclusion of freedist
 #						  code.
 # K_LONGTERM			- If set, the eclass will search for the kernel source
-#						  in the long term directories on the upstream servers 
+#						  in the long term directories on the upstream servers
 #						  as the location has been changed by upstream
 # H_SUPPORTEDARCH		- this should be a space separated list of ARCH's which
 #						  can be supported by the headers ebuild
@@ -161,14 +161,14 @@
 		KV_PATCH=$(get_version_component_range 3- ${OKV})
 	fi
 	KV_PATCH=${KV_PATCH/[-_]*}
-	
+
 	local v n=0 missing
-	for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do 
-		[[ -z ${!v} ]] && n=1 && missing="${missing}${v} "; 
+	for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do
+		[[ -z ${!v} ]] && n=1 && missing="${missing}${v} ";
 	done
 	[[ $n -eq 1 ]] && \
 		eerror "Missing variables: ${missing}" && \
-		die "Failed to extract kernel version (try explicit CKV in ebuild)!" 
+		die "Failed to extract kernel version (try explicit CKV in ebuild)!"
 	unset v n missing
 
 	KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
@@ -223,7 +223,7 @@
 	# KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION
 	if [[ -n ${KV_EXTRA} ]]; then
 		OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.bz2 
+		KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.bz2
 					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2"
 	fi
@@ -244,21 +244,21 @@
 
 	if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
 		OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
-		KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2 
+		KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2
 					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2"
 	fi
 
 	if [[ ${RELEASETYPE} == -git ]]; then
-		KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2 
+		KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2
 					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2"
 	fi
 
 	if [[ ${RELEASETYPE} == -rc-git ]]; then
 		OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
-		KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2 
-					${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 
+		KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2
+					${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2
 					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2"
@@ -321,7 +321,7 @@
 	DEPEND="!build? ( sys-apps/sed
 					  >=sys-devel/binutils-2.11.90.0.31 )"
 	RDEPEND="!build? ( >=sys-libs/ncurses-5.2
-			           sys-devel/make )"
+					   sys-devel/make )"
 	PDEPEND="!build? ( virtual/dev-manager )"
 
 	PROVIDE="virtual/linux-sources"
@@ -355,7 +355,7 @@
 			fi
 			DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}"
 			HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}"
-				
+
 			KERNEL_URI="${KERNEL_URI}
 				deblob? (
 					${DEBLOB_URI}
@@ -376,8 +376,6 @@
 	unset KBUILD_OUTPUT
 
 	if [[ ${CTARGET} = ${CHOST} ]]; then
-		DEPEND="!virtual/os-headers"
-		PROVIDE="virtual/os-headers"
 		SLOT="0"
 	else
 		SLOT="${CTARGET}"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/03/22 00:39:09

  Modified:             kernel-2.eclass
  Log:
  Bump delob max version

Revision  Changes    Path
1.248                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.248&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.248&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.247&r2=1.248

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- kernel-2.eclass	19 Mar 2011 18:15:34 -0000	1.247
+++ kernel-2.eclass	22 Mar 2011 00:39:09 -0000	1.248
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.247 2011/03/19 18:15:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.248 2011/03/22 00:39:09 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -89,7 +89,7 @@
 # This is the latest KV_PATCH of the deblob tool available from the
 # libre-sources upstream. If you bump this, you MUST regenerate the Manifests
 # for ALL kernel-2 consumer packages where deblob is available.
-[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=37
+[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=38
 
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Samuli Suominen (ssuominen)]

ssuominen    11/03/19 18:15:34

  Modified:             kernel-2.eclass
  Log:
  Remove virtual/alsa.

Revision  Changes    Path
1.247                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.247&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.247&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.246&r2=1.247

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- kernel-2.eclass	15 Mar 2011 13:16:26 -0000	1.246
+++ kernel-2.eclass	19 Mar 2011 18:15:34 -0000	1.247
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.246 2011/03/15 13:16:26 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.247 2011/03/19 18:15:34 ssuominen Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -325,7 +325,6 @@
 	PDEPEND="!build? ( virtual/dev-manager )"
 
 	PROVIDE="virtual/linux-sources"
-	kernel_is gt 2 4 && PROVIDE="${PROVIDE} virtual/alsa"
 
 	SLOT="${PVR}"
 	DESCRIPTION="Sources for the ${KV_MAJOR}.${KV_MINOR} linux kernel"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/03/15 13:16:26

  Modified:             kernel-2.eclass
  Log:
  Bump maximum kernel version for libre source deblob tool

Revision  Changes    Path
1.246                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.246&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.246&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.245&r2=1.246

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- kernel-2.eclass	10 Mar 2011 01:04:03 -0000	1.245
+++ kernel-2.eclass	15 Mar 2011 13:16:26 -0000	1.246
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.245 2011/03/10 01:04:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.246 2011/03/15 13:16:26 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -89,7 +89,7 @@
 # This is the latest KV_PATCH of the deblob tool available from the
 # libre-sources upstream. If you bump this, you MUST regenerate the Manifests
 # for ALL kernel-2 consumer packages where deblob is available.
-[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=36
+[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=37
 
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      11/03/10 01:04:03

  Modified:             kernel-2.eclass
  Log:
  drop support for kernel packages which dont natively support multilib since the multilib.eclass code is going away

Revision  Changes    Path
1.245                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.245&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.245&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.244&r2=1.245

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- kernel-2.eclass	18 Feb 2011 20:07:18 -0000	1.244
+++ kernel-2.eclass	10 Mar 2011 01:04:03 -0000	1.245
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.244 2011/02/18 20:07:18 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.245 2011/03/10 01:04:03 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -585,62 +585,15 @@
 
 	# Do not use "linux/*" as that can cause problems with very long
 	# $S values where the cmdline to cp is too long
-	cd "${S}"
+	pushd "${S}" >/dev/null
 	dodir ${ddir}/linux
 	cp -pPR "${S}"/include/linux "${D}"/${ddir}/ || die
 	rm -rf "${D}"/${ddir}/linux/modules
 
-	# Handle multilib headers and crap
-	local multi_dirs="" multi_defs=""
-	case $(tc-arch-kernel) in
-		sparc64)
-			multi_dirs="sparc sparc64"
-			multi_defs="!__arch64__ __arch64__"
-			;;
-		x86_64)
-			multi_dirs="i386 x86_64"
-			multi_defs="__i386__ __x86_64__"
-			;;
-		ppc64)
-			multi_dirs="ppc ppc64"
-			multi_defs="!__powerpc64__ __powerpc64__"
-			;;
-		s390x)
-			multi_dirs="s390 s390x"
-			multi_defs="!__s390x__ __s390x__"
-			;;
-		arm)
-			dodir ${ddir}/asm
-			cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
-			[[ ! -e ${D}/${ddir}/asm/arch ]] && ln -sf arch-ebsa285 "${D}"/${ddir}/asm/arch
-			[[ ! -e ${D}/${ddir}/asm/proc ]] && ln -sf proc-armv "${D}"/${ddir}/asm/proc
-			;;
-		powerpc)
-			dodir ${ddir}/asm
-			cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
-			if [[ -e "${S}"/include/asm-ppc ]] ; then
-				dodir ${ddir}/asm-ppc
-				cp -pPR "${S}"/include/asm-ppc/* "${D}"/${ddir}/asm-ppc
-			fi
-			;;
-		*)
-			dodir ${ddir}/asm
-			cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
-			;;
-	esac
-	if [[ -n ${multi_dirs} ]] ; then
-		local d ml_inc=""
-		for d in ${multi_dirs} ; do
-			dodir ${ddir}/asm-${d}
-			cp -pPR "${S}"/include/asm-${d}/* "${D}"/${ddir}/asm-${d}/ || die "cp asm-${d} failed"
+	dodir ${ddir}/asm
+	cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
 
-			ml_inc="${ml_inc} ${multi_defs%% *}:${ddir}/asm-${d}"
-			multi_defs=${multi_defs#* }
-		done
-		create_ml_includes ${ddir}/asm ${ml_inc}
-	fi
-
-	if kernel_is 2 6; then
+	if kernel_is 2 6 ; then
 		dodir ${ddir}/asm-generic
 		cp -pPR "${S}"/include/asm-generic/* "${D}"/${ddir}/asm-generic
 	fi
@@ -648,7 +601,7 @@
 	# clean up
 	find "${D}" -name '*.orig' -exec rm -f {} \;
 
-	cd ${OLDPWD}
+	popd >/dev/null
 }
 
 install_sources() {

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     11/02/18 20:07:18

  Modified:             kernel-2.eclass
  Log:
  Adding support for longterm kernels.

Revision  Changes    Path
1.244                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.244&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.244&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.243&r2=1.244

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -r1.243 -r1.244
--- kernel-2.eclass	28 Nov 2010 05:07:28 -0000	1.243
+++ kernel-2.eclass	18 Feb 2011 20:07:18 -0000	1.244
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.243 2010/11/28 05:07:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.244 2011/02/18 20:07:18 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -52,7 +52,9 @@
 #						  If false, either optional deblobbing will be available
 #						  or the license will note the inclusion of freedist
 #						  code.
-
+# K_LONGTERM			- If set, the eclass will search for the kernel source
+#						  in the long term directories on the upstream servers 
+#						  as the location has been changed by upstream
 # H_SUPPORTEDARCH		- this should be a space separated list of ARCH's which
 #						  can be supported by the headers ebuild
 
@@ -169,7 +171,11 @@
 		die "Failed to extract kernel version (try explicit CKV in ebuild)!" 
 	unset v n missing
 
-	KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+	KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}"
+	[[ -n "${K_LONGTERM}" ]] &&
+		KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+
+	KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 
 	RELEASE=${CKV/${OKV}}
 	RELEASE=${RELEASE/_beta}
@@ -217,8 +223,8 @@
 	# KV_FULL evaluates to MAJ.MIN.PAT.EXT.EXT after EXTRAVERSION
 	if [[ -n ${KV_EXTRA} ]]; then
 		OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${CKV}.bz2
-					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.tar.bz2"
+		KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.bz2 
+					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2"
 	fi
 
@@ -238,22 +244,23 @@
 
 	if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
 		OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
-		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/patch-${CKV//_/-}.bz2
-					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+		KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2 
+					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2"
 	fi
 
 	if [[ ${RELEASETYPE} == -git ]]; then
-		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${OKV}${RELEASE}.bz2
-					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+		KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2 
+					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2"
 	fi
 
 	if [[ ${RELEASETYPE} == -rc-git ]]; then
 		OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))"
-		KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2
-					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2
-					mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+		KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2 
+					${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 
+					${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2"
+
 		UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2"
 	fi
 

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/11/28 05:07:28

  Modified:             kernel-2.eclass
  Log:
  Add warning about updating the deblob max version variable.

Revision  Changes    Path
1.243                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.243&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.243&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.242&r2=1.243

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.242
retrieving revision 1.243
diff -p -w -b -B -u -u -r1.242 -r1.243
--- kernel-2.eclass	26 Nov 2010 23:41:45 -0000	1.242
+++ kernel-2.eclass	28 Nov 2010 05:07:28 -0000	1.243
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.242 2010/11/26 23:41:45 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.243 2010/11/28 05:07:28 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -85,7 +85,8 @@ HOMEPAGE="http://www.kernel.org/ http://
 	LICENSE="GPL-2"
 
 # This is the latest KV_PATCH of the deblob tool available from the
-# libre-sources upstream.
+# libre-sources upstream. If you bump this, you MUST regenerate the Manifests
+# for ALL kernel-2 consumer packages where deblob is available.
 [[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=36
 
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     10/11/26 23:41:46

  Modified:             kernel-2.eclass
  Log:
  Bump deblob max version to 36

Revision  Changes    Path
1.242                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.242&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.242&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.241&r2=1.242

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- kernel-2.eclass	17 Sep 2010 21:44:20 -0000	1.241
+++ kernel-2.eclass	26 Nov 2010 23:41:45 -0000	1.242
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.241 2010/09/17 21:44:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.242 2010/11/26 23:41:45 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -86,7 +86,7 @@
 
 # This is the latest KV_PATCH of the deblob tool available from the
 # libre-sources upstream.
-[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=35
+[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=36
 
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    10/09/17 21:44:20

  Modified:             kernel-2.eclass
  Log:
  Die when uncompressing patch fail. Acked by vapier and robbat2.

Revision  Changes    Path
1.241                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.241&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.241&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.240&r2=1.241

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- kernel-2.eclass	3 Aug 2010 18:31:08 -0000	1.240
+++ kernel-2.eclass	17 Sep 2010 21:44:20 -0000	1.241
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.240 2010/08/03 18:31:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.241 2010/09/17 21:44:20 scarabeus Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -870,9 +870,9 @@
 					PATCH_ORDER="${z}${STRICT_COUNT}"
 
 					mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/
-					$(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL})
+					$(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${PATCH_ORDER}/${x}.patch${PATCH_LEVEL}) || die "uncompressing patch failed"
 				else
-					$(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${x}.patch${PATCH_LEVEL})
+					$(${PIPE_CMD} ${i} > ${KPATCH_DIR}/${x}.patch${PATCH_LEVEL}) || die "uncompressing patch failed"
 				fi
 			fi
 		fi

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/08/03 17:22:14

  Modified:             kernel-2.eclass
  Log:
  kernel-2 deblob support for 2.6.35; bug #324505: deblob-check usage.

Revision  Changes    Path
1.239                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.239&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.239&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.238&r2=1.239

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.238
retrieving revision 1.239
diff -p -w -b -B -u -u -r1.238 -r1.239
--- kernel-2.eclass	30 Jul 2010 00:44:59 -0000	1.238
+++ kernel-2.eclass	3 Aug 2010 17:22:13 -0000	1.239
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.238 2010/07/30 00:44:59 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.239 2010/08/03 17:22:13 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -86,7 +86,7 @@ HOMEPAGE="http://www.kernel.org/ http://
 
 # This is the latest KV_PATCH of the deblob tool available from the
 # libre-sources upstream.
-[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=34
+[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=35
 
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"
@@ -338,12 +338,21 @@ if [[ ${ETYPE} == sources ]]; then
 
 			DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
 			DEBLOB_A="deblob-${DEBLOB_PV}"
+			DEBLOB_CHECK_A="deblob-check-${DEBLOB_PV}"
 			DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
+			DEBLOB_URI_PATH="download/releases/LATEST-${DEBLOB_PV}.N"
+			if ! has "${EAPI:-0}" 0 1 ; then
+				DEBLOB_CHECK_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/deblob-check -> ${DEBLOB_CHECK_A}"
+			else
+				DEBLOB_CHECK_URI="mirror://gentoo/${DEBLOB_CHECK_A}"
+			fi
+			DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}"
 			HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}"
 				
 			KERNEL_URI="${KERNEL_URI}
 				deblob? (
-					${DEBLOB_HOMEPAGE}/download/releases/LATEST-${DEBLOB_PV}.N/${DEBLOB_A}
+					${DEBLOB_URI}
+					${DEBLOB_CHECK_URI}
 				)"
 		else
 			# We have no way to deblob older kernels, so just mark them as
@@ -1125,8 +1134,9 @@ kernel-2_src_unpack() {
 	fi
 
 	if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then
-		cp "${DISTDIR}/${DEBLOB_A}" "${T}"
-		chmod +x "${T}/${DEBLOB_A}"
+		cp "${DISTDIR}/${DEBLOB_A}" "${T}" || die "cp ${DEBLOB_A} failed"
+		cp "${DISTDIR}/${DEBLOB_CHECK_A}" "${T}/deblob-check" || die "cp ${DEBLOB_CHECK_A} failed"
+		chmod +x "${T}/${DEBLOB_A}" "${T}/deblob-check" || die "chmod deblob scripts failed"
 	fi
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     10/07/30 00:44:59

  Modified:             kernel-2.eclass
  Log:
  Proper use of shopt functions from eutils. Thanks to Vapier for the patch.

Revision  Changes    Path
1.238                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.238&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.238&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.237&r2=1.238

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- kernel-2.eclass	19 Jul 2010 20:19:18 -0000	1.237
+++ kernel-2.eclass	30 Jul 2010 00:44:59 -0000	1.238
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.237 2010/07/19 20:19:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.238 2010/07/30 00:44:59 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -779,7 +779,7 @@
 #==============================================================
 unipatch() {
 	local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE
-	local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG extglob_bak
+	local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG
 
 	# set to a standard locale to ensure sorts are ordered properly.
 	myLC_ALL="${LC_ALL}"
@@ -791,8 +791,7 @@
 	[ ! -d ${KPATCH_DIR} ] && mkdir -p ${KPATCH_DIR}
 
 	# We're gonna need it when doing patches with a predefined patchlevel
-	extglob_bak=$(shopt -p extglob)
-	shopt -s extglob
+	eshopts_push -s extglob
 
 	# This function will unpack all passed tarballs, add any passed patches, and remove any passed patchnumbers
 	# usage can be either via an env var or by params
@@ -926,6 +925,7 @@
 						eend 1
 						eerror "Failed to apply patch ${i/*\//}"
 						eerror "Please attach ${STDERR_T} to any bug you may post."
+						eshopts_pop
 						die "Failed to apply ${i/*\//}"
 					fi
 				else
@@ -935,6 +935,7 @@
 			if [ ${PATCH_DEPTH} -eq 5 ]; then
 				eend 1
 				eerror "Please attach ${STDERR_T} to any bug you may post."
+				eshopts_pop
 				die "Unable to dry-run patch."
 			fi
 		done
@@ -955,7 +956,7 @@
 
 	LC_ALL="${myLC_ALL}"
 	LANG="${myLANG}"
-	eval ${extglob_bak}
+	eshopts_pop
 }
 
 # getfilevar accepts 2 vars as follows:

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      10/07/19 20:19:18

  Modified:             kernel-2.eclass
  Log:
  drop system libc re-emerge message for linux-headers #328317

Revision  Changes    Path
1.237                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.237&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.237&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.236&r2=1.237

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- kernel-2.eclass	5 Jun 2010 18:49:49 -0000	1.236
+++ kernel-2.eclass	19 Jul 2010 20:19:18 -0000	1.237
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.236 2010/06/05 18:49:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.237 2010/07/19 20:19:18 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -758,14 +758,6 @@
 	fi
 }
 
-postinst_headers() {
-	elog "Kernel headers are usually only used when recompiling your system libc, as"
-	elog "such, following the installation of newer headers, it is advised that you"
-	elog "re-merge your system libc."
-	elog "Failure to do so will cause your system libc to not make use of newer"
-	elog "features present in the updated kernel headers."
-}
-
 # pkg_setup functions
 #==============================================================
 setup_headers() {
@@ -1159,7 +1151,6 @@
 }
 
 kernel-2_pkg_postinst() {
-	[[ ${ETYPE} == headers ]] && postinst_headers
 	[[ ${ETYPE} == sources ]] && postinst_sources
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      10/06/05 18:49:49

  Modified:             kernel-2.eclass
  Log:
  support by Jens Pranaitis for xz/lzma patches #322235

Revision  Changes    Path
1.236                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.236&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.236&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.235&r2=1.236

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- kernel-2.eclass	28 May 2010 20:59:59 -0000	1.235
+++ kernel-2.eclass	5 Jun 2010 18:49:49 -0000	1.236
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.235 2010/05/28 20:59:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.236 2010/06/05 18:49:49 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -836,6 +836,8 @@
 			extention=${extention/:*/}
 			PIPE_CMD=""
 			case ${extention} in
+				     xz) PIPE_CMD="xz -dc";;
+				   lzma) PIPE_CMD="lzma -dc";;
 				    bz2) PIPE_CMD="bzip2 -dc";;
 				  patch) PIPE_CMD="cat";;
 				   diff) PIPE_CMD="cat";;

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/28 20:59:59

  Modified:             kernel-2.eclass
  Log:
  Bug #266157: Update deblob max version.

Revision  Changes    Path
1.235                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.235&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.235&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.234&r2=1.235

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.234
retrieving revision 1.235
diff -p -w -b -B -u -u -r1.234 -r1.235
--- kernel-2.eclass	20 May 2010 23:11:48 -0000	1.234
+++ kernel-2.eclass	28 May 2010 20:59:59 -0000	1.235
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.234 2010/05/20 23:11:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.235 2010/05/28 20:59:59 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -86,7 +86,7 @@ HOMEPAGE="http://www.kernel.org/ http://
 
 # This is the latest KV_PATCH of the deblob tool available from the
 # libre-sources upstream.
-[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=33
+[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=34
 
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/20 23:11:49

  Modified:             kernel-2.eclass
  Log:
  Bug #317297: Some kernel sources packages in overlays have version numbers like -9999 that does not allow us to work out what the actual version number is for functions like kernel_is. They SHOULD have a CKV variable in this case, but without it, they previously went into an infinite loop during the version detection in the eclass.

Revision  Changes    Path
1.234                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.234&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.234&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.233&r2=1.234

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.233
retrieving revision 1.234
diff -p -w -b -B -u -u -r1.233 -r1.234
--- kernel-2.eclass	2 May 2010 11:05:28 -0000	1.233
+++ kernel-2.eclass	20 May 2010 23:11:48 -0000	1.234
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.233 2010/05/02 11:05:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.234 2010/05/20 23:11:48 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -159,13 +159,25 @@ detect_version() {
 	fi
 	KV_PATCH=${KV_PATCH/[-_]*}
 
+	local v n=0 missing
+	for v in CKV OKV KV_{MAJOR,MINOR,PATCH} ; do 
+		[[ -z ${!v} ]] && n=1 && missing="${missing}${v} "; 
+	done
+	[[ $n -eq 1 ]] && \
+		eerror "Missing variables: ${missing}" && \
+		die "Failed to extract kernel version (try explicit CKV in ebuild)!" 
+	unset v n missing
+
 	KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
 
 	RELEASE=${CKV/${OKV}}
 	RELEASE=${RELEASE/_beta}
 	RELEASE=${RELEASE/_rc/-rc}
 	RELEASE=${RELEASE/_pre/-pre}
-	kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git}
+	# We cannot trivally call kernel_is here, because it calls us to detect the
+	# version
+	#kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git}
+	[ $(($KV_MAJOR * 1000 + $KV_MINOR)) -ge 2006 ] && RELEASE=${RELEASE/-pre/-git}
 	RELEASETYPE=${RELEASE//[0-9]}
 
 	# Now we know that RELEASE is the -rc/-git

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Ulrich Mueller (ulm)]

ulm         10/05/02 11:05:28

  Modified:             kernel-2.eclass
  Log:
  Fix typo.

Revision  Changes    Path
1.233                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.233&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.233&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.232&r2=1.233

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- kernel-2.eclass	2 May 2010 08:48:16 -0000	1.232
+++ kernel-2.eclass	2 May 2010 11:05:28 -0000	1.233
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.232 2010/05/02 08:48:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.233 2010/05/02 11:05:28 ulm Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -716,7 +716,7 @@
 	# optionally display security unsupported message
 	#  Start with why
 	if [[ ${K_SECURITY_UNSUPPORTED} = deblob ]]; then
-		ewarn "Deblobbed kernels are UNSUPPORTED by Gentoo Security"
+		ewarn "Deblobbed kernels are UNSUPPORTED by Gentoo Security."
 	elif [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
 		ewarn "${PN} is UNSUPPORTED by Gentoo Security."
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/05/02 08:48:16

  Modified:             kernel-2.eclass
  Log:
  Bug #318095: Improve K_SECURITY_UNSUPPORTED messages for deblobbing. Based a patch by Ulrich Müller <ulm@gentoo.org>.

Revision  Changes    Path
1.232                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.232&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.232&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.231&r2=1.232

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.231
retrieving revision 1.232
diff -p -w -b -B -u -u -r1.231 -r1.232
--- kernel-2.eclass	26 Apr 2010 08:05:10 -0000	1.231
+++ kernel-2.eclass	2 May 2010 08:48:16 -0000	1.232
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.231 2010/04/26 08:05:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.232 2010/05/02 08:48:16 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -669,7 +669,7 @@ postinst_sources() {
 	# if we're using a deblobbed kernel, it's not supported
 	[[ $K_DEBLOB_AVAILABLE == 1 ]] && \
 		use deblob && \
-		K_SECURITY_UNSUPPORTED=1
+		K_SECURITY_UNSUPPORTED=deblob
 
 	# if we are to forcably symlink, delete it if it already exists first.
 	if [[ ${K_SYMLINK} > 0 ]]; then
@@ -714,9 +714,14 @@ postinst_sources() {
 	fi
 
 	# optionally display security unsupported message
-	if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
-		echo
+	#  Start with why
+	if [[ ${K_SECURITY_UNSUPPORTED} = deblob ]]; then
+		ewarn "Deblobbed kernels are UNSUPPORTED by Gentoo Security"
+	elif [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
 		ewarn "${PN} is UNSUPPORTED by Gentoo Security."
+	fi
+	#  And now the general message.
+	if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
 		ewarn "This means that it is likely to be vulnerable to recent security issues."
 		ewarn "For specific information on why this kernel is unsupported, please read:"
 		ewarn "http://www.gentoo.org/proj/en/security/kernel.xml"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/26 08:05:10

  Modified:             kernel-2.eclass
  Log:
  Keep a mostly-internal variable of the latest version of the deblob tool releases by the upstream libre-sources guys, this saves us updating K_DEBLOB_AVAILABLE quite so often, but we need to remember to redigest sources ebuilds when we DO change the this variable instead.

Revision  Changes    Path
1.231                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.231&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.231&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.230&r2=1.231

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.230
retrieving revision 1.231
diff -p -w -b -B -u -u -r1.230 -r1.231
--- kernel-2.eclass	26 Apr 2010 07:26:06 -0000	1.230
+++ kernel-2.eclass	26 Apr 2010 08:05:10 -0000	1.231
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.230 2010/04/26 07:26:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.231 2010/04/26 08:05:10 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -84,6 +84,10 @@ HOMEPAGE="http://www.kernel.org/ http://
 [[ -z ${LICENSE} ]] && \
 	LICENSE="GPL-2"
 
+# This is the latest KV_PATCH of the deblob tool available from the
+# libre-sources upstream.
+[[ -z ${DEBLOB_MAX_VERSION} ]] && DEBLOB_MAX_VERSION=33
+
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"
 
@@ -309,15 +313,17 @@ if [[ ${ETYPE} == sources ]]; then
 
 	# Bug #266157, deblob for libre support
 	if [[ -z ${K_PREDEBLOBBED} ]] ; then
-		if kernel_is ge 2 6 27 && [[ -z ${K_DEBLOB_AVAILABLE} ]] ; then
+		if [[ -z ${K_DEBLOB_AVAILABLE} ]] ; then
+			kernel_is ge 2 6 27 && \
+				kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \
+				K_DEBLOB_AVAILABLE=1
+		fi
+		if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then
 			IUSE="${IUSE} deblob"
 			# Reflect that kernels contain firmware blobs unless otherwise
 			# stripped
 			LICENSE="${LICENSE} !deblob? ( freedist )"
 			
-			# This to to avoid us triggering some QA warnings
-			K_DEBLOB_AVAILABLE=1
-
 			DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
 			DEBLOB_A="deblob-${DEBLOB_PV}"
 			DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/26 07:26:06

  Modified:             kernel-2.eclass
  Log:
  Document the new deblob control variables, after renaming them to match the existing pattern.

Revision  Changes    Path
1.230                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.230&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.230&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.229&r2=1.230

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.229
retrieving revision 1.230
diff -p -w -b -B -u -u -r1.229 -r1.230
--- kernel-2.eclass	26 Apr 2010 07:15:03 -0000	1.229
+++ kernel-2.eclass	26 Apr 2010 07:26:06 -0000	1.230
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.229 2010/04/26 07:15:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.230 2010/04/26 07:26:06 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -45,6 +45,13 @@
 #						  A value of "5" would apply genpatches-2.6.12-5 to
 #						  my-sources-2.6.12.ebuild
 # K_SECURITY_UNSUPPORTED- If set, this kernel is unsupported by Gentoo Security
+# K_DEBLOB_AVAILABLE	- A value of "0" will disable all of the optional deblob
+#						  code. If empty, will be set to "1" if deblobbing is
+#						  possible. Test ONLY for "1".
+# K_PREDEBLOBBED		- This kernel was already deblobbed elsewhere.
+#						  If false, either optional deblobbing will be available
+#						  or the license will note the inclusion of freedist
+#						  code.
 
 # H_SUPPORTEDARCH		- this should be a space separated list of ARCH's which
 #						  can be supported by the headers ebuild
@@ -301,15 +308,15 @@ if [[ ${ETYPE} == sources ]]; then
 	IUSE="symlink build"
 
 	# Bug #266157, deblob for libre support
-	if [[ -z ${KERNEL_DEBLOBBED} ]] ; then
-		if kernel_is ge 2 6 27 ; then
+	if [[ -z ${K_PREDEBLOBBED} ]] ; then
+		if kernel_is ge 2 6 27 && [[ -z ${K_DEBLOB_AVAILABLE} ]] ; then
 			IUSE="${IUSE} deblob"
 			# Reflect that kernels contain firmware blobs unless otherwise
 			# stripped
 			LICENSE="${LICENSE} !deblob? ( freedist )"
 			
 			# This to to avoid us triggering some QA warnings
-			DEBLOB_AVAILABLE=1
+			K_DEBLOB_AVAILABLE=1
 
 			DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
 			DEBLOB_A="deblob-${DEBLOB_PV}"
@@ -654,7 +661,7 @@ postinst_sources() {
 	use symlink && K_SYMLINK=1
 
 	# if we're using a deblobbed kernel, it's not supported
-	[[ $DEBLOB_AVAILABLE == "1" ]] && \
+	[[ $K_DEBLOB_AVAILABLE == 1 ]] && \
 		use deblob && \
 		K_SECURITY_UNSUPPORTED=1
 
@@ -1099,7 +1106,7 @@ kernel-2_src_unpack() {
 		kernel_is 2 6 && unpack_2_6
 	fi
 
-	if [[ $DEBLOB_AVAILABLE == "1" ]] && use deblob ; then
+	if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then
 		cp "${DISTDIR}/${DEBLOB_A}" "${T}"
 		chmod +x "${T}/${DEBLOB_A}"
 	fi
@@ -1109,7 +1116,7 @@ kernel-2_src_compile() {
 	cd "${S}"
 	[[ ${ETYPE} == headers ]] && compile_headers
 
-	if [[ $DEBLOB_AVAILABLE == "1" ]] && use deblob ; then
+	if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then
 		echo ">>> Running deblob script ..."
 		sh "${T}/${DEBLOB_A}" --force || \
 			die "Deblob script failed to run!!!"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/26 07:15:03

  Modified:             kernel-2.eclass
  Log:
  Bug #266157: Deblob support for libre kernels.

Revision  Changes    Path
1.229                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.229&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.229&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.228&r2=1.229

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.228
retrieving revision 1.229
diff -p -w -b -B -u -u -r1.228 -r1.229
--- kernel-2.eclass	26 Apr 2010 06:48:33 -0000	1.228
+++ kernel-2.eclass	26 Apr 2010 07:15:03 -0000	1.229
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.228 2010/04/26 06:48:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.229 2010/04/26 07:15:03 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -74,9 +74,8 @@ if [[ ${CTARGET} == ${CHOST} && ${CATEGO
 fi
 
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ ${HOMEPAGE}"
-# Reflect that kernels contain firmware blobs unless otherwise stripped
 [[ -z ${LICENSE} ]] && \
-	LICENSE="GPL-2 freedist"
+	LICENSE="GPL-2"
 
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"
@@ -300,6 +299,34 @@ if [[ ${ETYPE} == sources ]]; then
 	SLOT="${PVR}"
 	DESCRIPTION="Sources for the ${KV_MAJOR}.${KV_MINOR} linux kernel"
 	IUSE="symlink build"
+
+	# Bug #266157, deblob for libre support
+	if [[ -z ${KERNEL_DEBLOBBED} ]] ; then
+		if kernel_is ge 2 6 27 ; then
+			IUSE="${IUSE} deblob"
+			# Reflect that kernels contain firmware blobs unless otherwise
+			# stripped
+			LICENSE="${LICENSE} !deblob? ( freedist )"
+			
+			# This to to avoid us triggering some QA warnings
+			DEBLOB_AVAILABLE=1
+
+			DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
+			DEBLOB_A="deblob-${DEBLOB_PV}"
+			DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
+			HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}"
+				
+			KERNEL_URI="${KERNEL_URI}
+				deblob? (
+					${DEBLOB_HOMEPAGE}/download/releases/LATEST-${DEBLOB_PV}.N/${DEBLOB_A}
+				)"
+		else
+			# We have no way to deblob older kernels, so just mark them as
+			# tainted with non-libre materials.
+			LICENSE="${LICENSE} freedist"
+		fi
+	fi
+
 elif [[ ${ETYPE} == headers ]]; then
 	DESCRIPTION="Linux system headers"
 
@@ -626,6 +653,11 @@ postinst_sources() {
 	# if we have USE=symlink, then force K_SYMLINK=1
 	use symlink && K_SYMLINK=1
 
+	# if we're using a deblobbed kernel, it's not supported
+	[[ $DEBLOB_AVAILABLE == "1" ]] && \
+		use deblob && \
+		K_SECURITY_UNSUPPORTED=1
+
 	# if we are to forcably symlink, delete it if it already exists first.
 	if [[ ${K_SYMLINK} > 0 ]]; then
 		[[ -h ${ROOT}usr/src/linux ]] && rm ${ROOT}usr/src/linux
@@ -1066,11 +1098,22 @@ kernel-2_src_unpack() {
 		kernel_is 2 4 && unpack_2_4
 		kernel_is 2 6 && unpack_2_6
 	fi
+
+	if [[ $DEBLOB_AVAILABLE == "1" ]] && use deblob ; then
+		cp "${DISTDIR}/${DEBLOB_A}" "${T}"
+		chmod +x "${T}/${DEBLOB_A}"
+	fi
 }
 
 kernel-2_src_compile() {
 	cd "${S}"
 	[[ ${ETYPE} == headers ]] && compile_headers
+
+	if [[ $DEBLOB_AVAILABLE == "1" ]] && use deblob ; then
+		echo ">>> Running deblob script ..."
+		sh "${T}/${DEBLOB_A}" --force || \
+			die "Deblob script failed to run!!!"
+	fi
 }
 
 kernel-2_pkg_preinst() {

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/26 06:48:33

  Modified:             kernel-2.eclass
  Log:
  Refactor debug-print-kernel2-variables to make it faster to add new stuff.

Revision  Changes    Path
1.228                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.228&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.228&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.227&r2=1.228

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.227
retrieving revision 1.228
diff -p -w -b -B -u -u -r1.227 -r1.228
--- kernel-2.eclass	26 Apr 2010 06:46:25 -0000	1.227
+++ kernel-2.eclass	26 Apr 2010 06:48:33 -0000	1.228
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.227 2010/04/26 06:46:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.228 2010/04/26 06:48:33 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -91,21 +91,11 @@ RESTRICT="binchecks strip"
 # if you are adding new functionality in, put a call to it
 # at the start of src_unpack, or during SRC_URI/dep generation.
 debug-print-kernel2-variables() {
-	debug-print "PVR: ${PVR}"
-	debug-print "CKV: ${CKV}"
-	debug-print "OKV: ${OKV}"
-	debug-print "KV: ${KV}"
-	debug-print "KV_FULL: ${KV_FULL}"
-	debug-print "KV_MAJOR: ${KV_MAJOR}"
-	debug-print "KV_MINOR: ${KV_MINOR}"
-	debug-print "KV_PATCH: ${KV_PATCH}"
-	debug-print "RELEASETYPE: ${RELEASETYPE}"
-	debug-print "RELEASE: ${RELEASE}"
-	debug-print "UNIPATCH_LIST_DEFAULT: ${UNIPATCH_LIST_DEFAULT} "
-	debug-print "UNIPATCH_LIST_GENPATCHES: ${UNIPATCH_LIST_GENPATCHES} "
-	debug-print "UNIPATCH_LIST: ${UNIPATCH_LIST}"
-	debug-print "S: ${S}"
-	debug-print "KERNEL_URI: ${KERNEL_URI}"
+	for v in PVR CKV OKV KV KV_FULL KV_MAJOR KV_MINOR KV_PATCH RELEASETYPE \
+			RELEASE UNIPATCH_LIST_DEFAULT UNIPATCH_LIST_GENPATCHES \
+			UNIPATCH_LIST S KERNEL_URI ; do
+		debug-print "${v}: ${!v}"
+	done
 }
 
 #Eclass functions only from here onwards ...

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/26 06:46:25

  Modified:             kernel-2.eclass
  Log:
  Add more variables to the debug output list when it does fire.

Revision  Changes    Path
1.227                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.227&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.227&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.226&r2=1.227

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.226
retrieving revision 1.227
diff -p -w -b -B -u -u -r1.226 -r1.227
--- kernel-2.eclass	26 Apr 2010 06:44:38 -0000	1.226
+++ kernel-2.eclass	26 Apr 2010 06:46:25 -0000	1.227
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.226 2010/04/26 06:44:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.227 2010/04/26 06:46:25 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -96,6 +96,9 @@ debug-print-kernel2-variables() {
 	debug-print "OKV: ${OKV}"
 	debug-print "KV: ${KV}"
 	debug-print "KV_FULL: ${KV_FULL}"
+	debug-print "KV_MAJOR: ${KV_MAJOR}"
+	debug-print "KV_MINOR: ${KV_MINOR}"
+	debug-print "KV_PATCH: ${KV_PATCH}"
 	debug-print "RELEASETYPE: ${RELEASETYPE}"
 	debug-print "RELEASE: ${RELEASE}"
 	debug-print "UNIPATCH_LIST_DEFAULT: ${UNIPATCH_LIST_DEFAULT} "

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/26 06:44:38

  Modified:             kernel-2.eclass
  Log:
  While working on the libre-sources bug, I noticed that some of the kernel sources ebuilds out there have OKV set, but NOT KV_*, leading kernel_is to always return false. Check all of the variables we need for safety instead.

Revision  Changes    Path
1.226                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.226&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.226&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.225&r2=1.226

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.225
retrieving revision 1.226
diff -p -w -b -B -u -u -r1.225 -r1.226
--- kernel-2.eclass	1 Apr 2010 21:12:20 -0000	1.225
+++ kernel-2.eclass	26 Apr 2010 06:44:38 -0000	1.226
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.225 2010/04/01 21:12:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.226 2010/04/26 06:44:38 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -247,7 +247,14 @@ detect_version() {
 }
 
 kernel_is() {
-	[[ -z ${OKV} ]] && detect_version
+	# ALL of these should be set before we can safely continue this function.
+	# some of the sources have in the past had only one set.
+	local v n=0
+	for v in OKV KV_{MAJOR,MINOR,PATCH} ; do [[ -z ${!v} ]] && n=1 ; done
+	[[ $n -eq 1 ]] && detect_version
+	unset v n
+
+	# Now we can continue
 	local operator test value x=0 y=0 z=0
 
 	case ${1} in

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/04/01 21:12:20

  Modified:             kernel-2.eclass
  Log:
  Bug #266157: Until such time as we have full deblob support for all sources, mark that kernels contain firmware blobs that are covered under the freedist license, not GPL-2.

Revision  Changes    Path
1.225                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.225&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.225&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.224&r2=1.225

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.224
retrieving revision 1.225
diff -p -w -b -B -u -u -r1.224 -r1.225
--- kernel-2.eclass	13 Dec 2009 18:56:49 -0000	1.224
+++ kernel-2.eclass	1 Apr 2010 21:12:20 -0000	1.225
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.224 2009/12/13 18:56:49 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.225 2010/04/01 21:12:20 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -74,7 +74,9 @@ if [[ ${CTARGET} == ${CHOST} && ${CATEGO
 fi
 
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ ${HOMEPAGE}"
-LICENSE="GPL-2"
+# Reflect that kernels contain firmware blobs unless otherwise stripped
+[[ -z ${LICENSE} ]] && \
+	LICENSE="GPL-2 freedist"
 
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     09/12/13 18:56:49

  Modified:             kernel-2.eclass
  Log:
  Adding epatch_user to kernel-2 eclass

Revision  Changes    Path
1.224                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.224&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.224&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.223&r2=1.224

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- kernel-2.eclass	25 Nov 2009 18:46:57 -0000	1.223
+++ kernel-2.eclass	13 Dec 2009 18:56:49 -0000	1.224
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.223 2009/11/25 18:46:57 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.224 2009/12/13 18:56:49 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -1044,6 +1044,9 @@
 	# we run misc `make` functions below
 	[[ $(type -t kernel-2_hook_premake) == "function" ]] && kernel-2_hook_premake
 
+	debug-print "Doing epatch_user"
+	epatch_user
+
 	debug-print "Doing unpack_set_extraversion"
 
 	[[ -z ${K_NOSETEXTRAVERSION} ]] && unpack_set_extraversion

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     09/11/25 18:46:57

  Modified:             kernel-2.eclass
  Log:
  QA fixes as per bug #258206. Thanks to maekke.

Revision  Changes    Path
1.223                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.223&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.223&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.222&r2=1.223

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- kernel-2.eclass	20 Oct 2009 19:51:24 -0000	1.222
+++ kernel-2.eclass	25 Nov 2009 18:46:57 -0000	1.223
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.222 2009/10/20 19:51:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.223 2009/11/25 18:46:57 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -377,7 +377,7 @@
 }
 
 universal_unpack() {
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 	unpack linux-${OKV}.tar.bz2
 	if [[ -d "linux" ]]; then
 		mv linux linux-${KV_FULL} \
@@ -491,7 +491,7 @@
 #==============================================================
 install_universal() {
 	#fix silly permissions in tarball
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 	chown -R root:0 * >& /dev/null
 	chmod -R a+r-w+X,u+w *
 	cd ${OLDPWD}
@@ -546,22 +546,22 @@
 			;;
 		powerpc)
 			dodir ${ddir}/asm
-			cp -pPR "${S}"/include/asm/* ${D}/${ddir}/asm
+			cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
 			if [[ -e "${S}"/include/asm-ppc ]] ; then
 				dodir ${ddir}/asm-ppc
-				cp -pPR "${S}"/include/asm-ppc/* ${D}/${ddir}/asm-ppc
+				cp -pPR "${S}"/include/asm-ppc/* "${D}"/${ddir}/asm-ppc
 			fi
 			;;
 		*)
 			dodir ${ddir}/asm
-			cp -pPR "${S}"/include/asm/* ${D}/${ddir}/asm
+			cp -pPR "${S}"/include/asm/* "${D}"/${ddir}/asm
 			;;
 	esac
 	if [[ -n ${multi_dirs} ]] ; then
 		local d ml_inc=""
 		for d in ${multi_dirs} ; do
 			dodir ${ddir}/asm-${d}
-			cp -pPR "${S}"/include/asm-${d}/* ${D}/${ddir}/asm-${d}/ || die "cp asm-${d} failed"
+			cp -pPR "${S}"/include/asm-${d}/* "${D}"/${ddir}/asm-${d}/ || die "cp asm-${d} failed"
 
 			ml_inc="${ml_inc} ${multi_defs%% *}:${ddir}/asm-${d}"
 			multi_defs=${multi_defs#* }
@@ -571,7 +571,7 @@
 
 	if kernel_is 2 6; then
 		dodir ${ddir}/asm-generic
-		cp -pPR "${S}"/include/asm-generic/* ${D}/${ddir}/asm-generic
+		cp -pPR "${S}"/include/asm-generic/* "${D}"/${ddir}/asm-generic
 	fi
 
 	# clean up
@@ -605,7 +605,7 @@
 			> "${S}"/patches.txt
 	fi
 
-	mv ${WORKDIR}/linux* ${D}/usr/src
+	mv ${WORKDIR}/linux* "${D}"/usr/src
 }
 
 # pkg_preinst functions
@@ -634,7 +634,7 @@
 	[[ ! -h ${ROOT}usr/src/linux ]] && MAKELINK=1
 
 	if [[ ${MAKELINK} == 1 ]]; then
-		cd ${ROOT}usr/src
+		cd "${ROOT}"usr/src
 		ln -sf linux-${KV_FULL} linux
 		cd ${OLDPWD}
 	fi
@@ -888,7 +888,7 @@
 	local tmp
 	for i in ${UNIPATCH_DOCS}; do
 		tmp="${tmp} ${i//*\/}"
-		cp -f ${i} ${T}/
+		cp -f ${i} "${T}"/
 	done
 	UNIPATCH_DOCS="${tmp}"
 

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Robin H. Johnson (robbat2)]

robbat2     09/10/20 19:51:25

  Modified:             kernel-2.eclass
  Log:
  Preserve usage of USE=build in the PDEPEND change.

Revision  Changes    Path
1.222                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.222&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.222&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.221&r2=1.222

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.221
retrieving revision 1.222
diff -p -w -b -B -u -u -r1.221 -r1.222
--- kernel-2.eclass	20 Oct 2009 19:17:59 -0000	1.221
+++ kernel-2.eclass	20 Oct 2009 19:51:24 -0000	1.222
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.221 2009/10/20 19:17:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.222 2009/10/20 19:51:24 robbat2 Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -290,7 +290,7 @@ if [[ ${ETYPE} == sources ]]; then
 					  >=sys-devel/binutils-2.11.90.0.31 )"
 	RDEPEND="!build? ( >=sys-libs/ncurses-5.2
 			           sys-devel/make )"
-	PDEPEND="virtual/dev-manager"
+	PDEPEND="!build? ( virtual/dev-manager )"
 
 	PROVIDE="virtual/linux-sources"
 	kernel_is gt 2 4 && PROVIDE="${PROVIDE} virtual/alsa"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Zac Medico (zmedico)]

zmedico     09/10/20 19:17:59

  Modified:             kernel-2.eclass
  Log:
  Bug #283845 - Move virtual/dev-manager to PDEPEND to break circular deps.

Revision  Changes    Path
1.221                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.221&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.221&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.220&r2=1.221

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- kernel-2.eclass	11 Oct 2009 11:43:56 -0000	1.220
+++ kernel-2.eclass	20 Oct 2009 19:17:59 -0000	1.221
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.220 2009/10/11 11:43:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.221 2009/10/20 19:17:59 zmedico Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -289,8 +289,8 @@
 	DEPEND="!build? ( sys-apps/sed
 					  >=sys-devel/binutils-2.11.90.0.31 )"
 	RDEPEND="!build? ( >=sys-libs/ncurses-5.2
-			           sys-devel/make )
-			 virtual/dev-manager"
+			           sys-devel/make )"
+	PDEPEND="virtual/dev-manager"
 
 	PROVIDE="virtual/linux-sources"
 	kernel_is gt 2 4 && PROVIDE="${PROVIDE} virtual/alsa"

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Markus Meier (maekke)]

maekke      09/10/11 11:43:57

  Modified:             kernel-2.eclass
  Log:
  whitespace

Revision  Changes    Path
1.220                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.220&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.220&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.219&r2=1.220

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- kernel-2.eclass	28 Aug 2009 16:28:13 -0000	1.219
+++ kernel-2.eclass	11 Oct 2009 11:43:56 -0000	1.220
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.219 2009/08/28 16:28:13 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.220 2009/10/11 11:43:56 maekke Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -821,7 +821,7 @@
 
 	# do not apply fbcondecor patch to sparc/sparc64 as it breaks boot
 	# bug #272676
-	if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then 
+	if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then
 		if [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.28 ]]; then
 			UNIPATCH_DROP="${UNIPATCH_DROP} *_fbcondecor-0.9.6.patch"
 			echo

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     09/08/28 16:28:13

  Modified:             kernel-2.eclass
  Log:
  Removing fbcondecor for sparc/sparc64 as it currently prevents sparc/sparc64 from booting. bug #272676.

Revision  Changes    Path
1.219                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.219&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.219&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.218&r2=1.219

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- kernel-2.eclass	23 Feb 2009 05:51:14 -0000	1.218
+++ kernel-2.eclass	28 Aug 2009 16:28:13 -0000	1.219
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.218 2009/02/23 05:51:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.219 2009/08/28 16:28:13 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -819,6 +819,19 @@
 		KPATCH_DIR="${KPATCH_DIR} ${i}"
 	done
 
+	# do not apply fbcondecor patch to sparc/sparc64 as it breaks boot
+	# bug #272676
+	if [[ "$(tc-arch)" = "sparc" || "$(tc-arch)" = "sparc64" ]]; then 
+		if [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.28 ]]; then
+			UNIPATCH_DROP="${UNIPATCH_DROP} *_fbcondecor-0.9.6.patch"
+			echo
+			ewarn "fbcondecor currently prevents sparc/sparc64 from booting"
+			ewarn "for kernel versions >= 2.6.29. Removing fbcondecor patch."
+			ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=272676 for details"
+			echo
+		fi
+	fi
+
 	#so now lets get rid of the patchno's we want to exclude
 	UNIPATCH_DROP="${UNIPATCH_EXCLUDE} ${UNIPATCH_DROP}"
 	for i in ${UNIPATCH_DROP}; do

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     08/11/13 23:50:55

  Modified:             kernel-2.eclass
  Log:
  Adding ppc Makefile fix for bug #234179. Thanks to Josejx.

Revision  Changes    Path
1.216                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.216&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.216&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.215&r2=1.216

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- kernel-2.eclass	7 Aug 2008 02:05:49 -0000	1.215
+++ kernel-2.eclass	13 Nov 2008 23:50:55 -0000	1.216
@@ -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.215 2008/08/07 02:05:49 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.216 2008/11/13 23:50:55 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -399,6 +399,10 @@
 		sed -i \
 			-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|' \
+			"${S}"/arch/powerpc/Makefile
 	fi
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     08/08/07 02:05:50

  Modified:             kernel-2.eclass
  Log:
  Temp fix for 2.6.27 kernels thanks to lavajoe

Revision  Changes    Path
1.215                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.215&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.215&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.214&r2=1.215

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- kernel-2.eclass	9 Jul 2008 19:52:20 -0000	1.214
+++ kernel-2.eclass	7 Aug 2008 02:05:49 -0000	1.215
@@ -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.214 2008/07/09 19:52:20 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.215 2008/08/07 02:05:49 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -392,9 +392,14 @@
 	find . -iname "*~" -exec rm {} \; 2> /dev/null
 
 	# fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox
-	sed -i \
-		-e 's|TOUT	:= .tmp_gas_check|TOUT	:= $(T).tmp_gas_check|' \
-		"${S}"/arch/ppc/Makefile
+	# only do this for kernel < 2.6.27 since this file does not exist in later
+	# kernels
+	if [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} < 2.6.27 ]]
+	then
+		sed -i \
+			-e 's|TOUT	:= .tmp_gas_check|TOUT	:= $(T).tmp_gas_check|' \
+			"${S}"/arch/ppc/Makefile
+	fi
 }
 
 unpack_set_extraversion() {

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Friedrich Oslage (bluebird)]

bluebird    08/07/09 19:52:20

  Modified:             kernel-2.eclass
  Log:
  add warning for sparc users that they need to do cross-compiling with >= 2.6.25(bug #214765)

Revision  Changes    Path
1.214                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.214&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.214&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.213&r2=1.214

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- kernel-2.eclass	1 Jun 2008 23:28:59 -0000	1.213
+++ kernel-2.eclass	9 Jul 2008 19:52:20 -0000	1.214
@@ -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.213 2008/06/01 23:28:59 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.214 2008/07/09 19:52:20 bluebird Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -665,6 +665,24 @@
 		ewarn "For specific information on why this kernel is unsupported, please read:"
 		ewarn "http://www.gentoo.org/proj/en/security/kernel.xml"
 	fi
+
+	# warn sparc users that they need to do cross-compiling with >= 2.6.25(bug #214765)
+	KV_MAJOR=$(get_version_component_range 1 ${OKV})
+	KV_MINOR=$(get_version_component_range 2 ${OKV})
+	KV_PATCH=$(get_version_component_range 3 ${OKV})
+	if [[ "$(tc-arch)" = "sparc" ]] \
+		&& [[ ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} > 2.6.24 ]]
+	then
+		echo
+		elog "NOTE: Since 2.6.25 the kernel Makefile has changed in a way that"
+		elog "you now need to do"
+		elog "  make CROSS_COMPILE=sparc64-unknown-linux-gnu-"
+		elog "instead of just"
+		elog "  make"
+		elog "to compile the kernel. For more information please browse to"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=214765"
+		echo
+	fi
 }
 
 postinst_headers() {



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     08/06/01 23:29:00

  Modified:             kernel-2.eclass
  Log:
  Removed reference to 2.4 to 2.6 migration document

Revision  Changes    Path
1.213                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.213&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.213&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.212&r2=1.213

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- kernel-2.eclass	3 May 2008 16:07:34 -0000	1.212
+++ kernel-2.eclass	1 Jun 2008 23:28:59 -0000	1.213
@@ -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.212 2008/05/03 16:07:34 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.213 2008/06/01 23:28:59 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -635,9 +635,8 @@
 
 	echo
 	elog "If you are upgrading from a previous kernel, you may be interested"
-	elog "in the following documents:"
+	elog "in the following document:"
 	elog "  - General upgrade guide: http://www.gentoo.org/doc/en/kernel-upgrade.xml"
-	kernel_is_2_6 && elog "  - 2.4 to 2.6 migration guide: http://www.gentoo.org/doc/en/migration-to-2.6.xml"
 	echo
 
 	# if K_EXTRAEINFO is set then lets display it now



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Daniel Drake (dsd)]

dsd         08/05/03 16:07:35

  Modified:             kernel-2.eclass
  Log:
  remove defconfig workaround now that the stable kernel is fixed

Revision  Changes    Path
1.212                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.212&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.212&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.211&r2=1.212

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- kernel-2.eclass	28 Apr 2008 19:22:44 -0000	1.211
+++ kernel-2.eclass	3 May 2008 16:07:34 -0000	1.212
@@ -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.211 2008/04/28 19:22:44 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.212 2008/05/03 16:07:34 dsd Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -633,18 +633,6 @@
 	# Don't forget to make directory for sysfs
 	[[ ! -d ${ROOT}sys ]] && kernel_is 2 6 && mkdir ${ROOT}sys
 
-	# fix for bug #215442 due to the change for x86 to use a 
-	# different file name for the default configuration
-	if kernel_is ge 2 6 24 && [[ ! -e ${ROOT}/usr/src/linux-${KV_FULL}/.config ]] ; then
-		case $(tc-arch-kernel) in
-			x86|x86_64)
-				einfo "Running make defconfig as a temporary workaround for bug #215442"
-				cd ${ROOT}/usr/src/linux-${KV_FULL}
-				make -s defconfig ${xmakeopts} &>/dev/null 2>&1
-				;;
-		esac
-	fi
-
 	echo
 	elog "If you are upgrading from a previous kernel, you may be interested"
 	elog "in the following documents:"



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     08/04/28 19:22:44

  Modified:             kernel-2.eclass
  Log:
  Fix for make defconfig. Bug #215442

Revision  Changes    Path
1.211                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.211&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.211&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.210&r2=1.211

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- kernel-2.eclass	12 Apr 2008 22:45:56 -0000	1.210
+++ kernel-2.eclass	28 Apr 2008 19:22:44 -0000	1.211
@@ -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.210 2008/04/12 22:45:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.211 2008/04/28 19:22:44 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -635,11 +635,11 @@
 
 	# fix for bug #215442 due to the change for x86 to use a 
 	# different file name for the default configuration
-	if kernel_is ge 2 6 24 && [[ ! -e ${D}/usr/src/linux-${KV_FULL}/.config ]] ; then
+	if kernel_is ge 2 6 24 && [[ ! -e ${ROOT}/usr/src/linux-${KV_FULL}/.config ]] ; then
 		case $(tc-arch-kernel) in
 			x86|x86_64)
 				einfo "Running make defconfig as a temporary workaround for bug #215442"
-				cd ${D}/usr/src/linux-${KV_FULL}
+				cd ${ROOT}/usr/src/linux-${KV_FULL}
 				make -s defconfig ${xmakeopts} &>/dev/null 2>&1
 				;;
 		esac



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Frysinger (vapier)]

vapier      08/04/12 22:45:57

  Modified:             kernel-2.eclass
  Log:
  use unpack rather than parsing the file format / calling tar all ourselves

Revision  Changes    Path
1.210                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.210&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.210&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.209&r2=1.210

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- kernel-2.eclass	5 Apr 2008 12:29:26 -0000	1.209
+++ kernel-2.eclass	12 Apr 2008 22:45:56 -0000	1.210
@@ -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.209 2008/04/05 12:29:26 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.210 2008/04/12 22:45:56 vapier Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -733,18 +733,7 @@
 
 	#unpack any passed tarballs
 	for i in ${UNIPATCH_LIST}; do
-		if [ -n "$(echo ${i} | grep -e "\.tar" -e "\.tbz" -e "\.tgz")" ]; then
-			extention=${i/*./}
-			extention=${extention/:*/}
-			case ${extention} in
-				tbz2) PIPE_CMD="tar -xvjf";;
-				 bz2) PIPE_CMD="tar -xvjf";;
-				 tgz) PIPE_CMD="tar -xvzf";;
-				  gz) PIPE_CMD="tar -xvzf";;
-				   *) eerror "Unrecognized tarball compression"
-				      die "Unrecognized tarball compression";;
-			esac
-
+		if echo ${i} | grep -qs -e "\.tar" -e "\.tbz" -e "\.tgz" ; then
 			if [ -n "${UNIPATCH_STRICTORDER}" ]; then
 				unset z
 				STRICT_COUNT=$((10#${STRICT_COUNT} + 1))
@@ -753,19 +742,17 @@
 				done
 				PATCH_ORDER="${z}${STRICT_COUNT}"
 
-				mkdir -p ${KPATCH_DIR}/${PATCH_ORDER}/
-				${PIPE_CMD} ${i/:*/} -C ${KPATCH_DIR}/${PATCH_ORDER}/ 1>/dev/null
+				mkdir -p "${KPATCH_DIR}/${PATCH_ORDER}"
+				pushd "${KPATCH_DIR}/${PATCH_ORDER}" >/dev/null
+				unpack ${i##*/}
+				popd >/dev/null
 			else
-				${PIPE_CMD} ${i/:*/} -C ${KPATCH_DIR} 1>/dev/null
+				pushd "${KPATCH_DIR}" >/dev/null
+				unpack ${i##*/}
+				popd >/dev/null
 			fi
 
-			if [ $? == 0 ]; then
-				einfo "${i/*\//} unpacked"
-				[ -n "$(echo ${i} | grep ':')" ] && echo ">>> Strict patch levels not currently supported for tarballed patchsets"
-			else
-				eerror "Failed to unpack ${i/:*/}"
-				die "unable to unpack patch tarball"
-			fi
+			[[ ${i} == *:* ]] && echo ">>> Strict patch levels not currently supported for tarballed patchsets"
 		else
 			extention=${i/*./}
 			extention=${extention/:*/}



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Mike Pagano (mpagano)]

mpagano     08/04/05 12:29:27

  Modified:             kernel-2.eclass
  Log:
  Change to run make defconfig as a temporary workaround for bug #215442

Revision  Changes    Path
1.209                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.209&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.209&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.208&r2=1.209

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- kernel-2.eclass	1 Mar 2008 18:47:33 -0000	1.208
+++ kernel-2.eclass	5 Apr 2008 12:29:26 -0000	1.209
@@ -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.208 2008/03/01 18:47:33 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.209 2008/04/05 12:29:26 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -633,6 +633,18 @@
 	# Don't forget to make directory for sysfs
 	[[ ! -d ${ROOT}sys ]] && kernel_is 2 6 && mkdir ${ROOT}sys
 
+	# fix for bug #215442 due to the change for x86 to use a 
+	# different file name for the default configuration
+	if kernel_is ge 2 6 24 && [[ ! -e ${D}/usr/src/linux-${KV_FULL}/.config ]] ; then
+		case $(tc-arch-kernel) in
+			x86|x86_64)
+				einfo "Running make defconfig as a temporary workaround for bug #215442"
+				cd ${D}/usr/src/linux-${KV_FULL}
+				make -s defconfig ${xmakeopts} &>/dev/null 2>&1
+				;;
+		esac
+	fi
+
 	echo
 	elog "If you are upgrading from a previous kernel, you may be interested"
 	elog "in the following documents:"



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Bo Oersted Andresen (zlin)]

zlin        08/03/01 18:47:34

  Modified:             kernel-2.eclass
  Log:
  Add support for K_EXTRAELOG. Use elog instead of einfo (bug #199464).

Revision  Changes    Path
1.208                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.208&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.208&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.207&r2=1.208

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- kernel-2.eclass	17 Dec 2007 16:05:13 -0000	1.207
+++ kernel-2.eclass	1 Mar 2008 18:47:33 -0000	1.208
@@ -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.207 2007/12/17 16:05:13 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.208 2008/03/01 18:47:33 zlin Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -33,7 +33,8 @@
 # K_EXTRAEINFO			- this is a new-line seperated list of einfo displays in
 #						  postinst and can be used to carry additional postinst
 #						  messages
-# K_EXTRAEWARN			- same as K_EXTRAEINFO except ewarn's instead of einfo's
+# K_EXTRAELOG			- same as K_EXTRAEINFO except using elog instead of einfo
+# K_EXTRAEWARN			- same as K_EXTRAEINFO except using ewarn instead of einfo
 # K_SYMLINK				- if this is set, then forcably create symlink anyway
 #
 # K_DEFCONFIG			- Allow specifying a different defconfig target.
@@ -633,10 +634,10 @@
 	[[ ! -d ${ROOT}sys ]] && kernel_is 2 6 && mkdir ${ROOT}sys
 
 	echo
-	einfo "If you are upgrading from a previous kernel, you may be interested"
-	einfo "in the following documents:"
-	einfo "  - General upgrade guide: http://www.gentoo.org/doc/en/kernel-upgrade.xml"
-	kernel_is_2_6 && einfo "  - 2.4 to 2.6 migration guide: http://www.gentoo.org/doc/en/migration-to-2.6.xml"
+	elog "If you are upgrading from a previous kernel, you may be interested"
+	elog "in the following documents:"
+	elog "  - General upgrade guide: http://www.gentoo.org/doc/en/kernel-upgrade.xml"
+	kernel_is_2_6 && elog "  - 2.4 to 2.6 migration guide: http://www.gentoo.org/doc/en/migration-to-2.6.xml"
 	echo
 
 	# if K_EXTRAEINFO is set then lets display it now
@@ -645,6 +646,12 @@
 		while read -s ELINE; do	einfo "${ELINE}"; done
 	fi
 
+	# if K_EXTRAELOG is set then lets display it now
+	if [[ -n ${K_EXTRAELOG} ]]; then
+		echo ${K_EXTRAELOG} | fmt |
+		while read -s ELINE; do	elog "${ELINE}"; done
+	fi
+
 	# if K_EXTRAEWARN is set then lets display it now
 	if [[ -n ${K_EXTRAEWARN} ]]; then
 		echo ${K_EXTRAEWARN} | fmt |
@@ -662,11 +669,11 @@
 }
 
 postinst_headers() {
-	einfo "Kernel headers are usually only used when recompiling your system libc, as"
-	einfo "such, following the installation of newer headers, it is advised that you"
-	einfo "re-merge your system libc."
-	einfo "Failure to do so will cause your system libc to not make use of newer"
-	einfo "features present in the updated kernel headers."
+	elog "Kernel headers are usually only used when recompiling your system libc, as"
+	elog "such, following the installation of newer headers, it is advised that you"
+	elog "re-merge your system libc."
+	elog "Failure to do so will cause your system libc to not make use of newer"
+	elog "features present in the updated kernel headers."
 }
 
 # pkg_setup functions



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: kernel-2.eclass

[Daniel Drake (dsd)]

dsd         07/12/17 16:05:13

  Modified:             kernel-2.eclass
  Log:
  remove 2.6.13 devfs notice, there's not much point showing this any more since the migration happened ages ago

Revision  Changes    Path
1.207                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.207&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?rev=1.207&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kernel-2.eclass?r1=1.206&r2=1.207

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- kernel-2.eclass	3 Oct 2007 12:53:10 -0000	1.206
+++ kernel-2.eclass	17 Dec 2007 16:05:13 -0000	1.207
@@ -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.206 2007/10/03 12:53:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.207 2007/12/17 16:05:13 dsd Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -637,11 +637,6 @@
 	einfo "in the following documents:"
 	einfo "  - General upgrade guide: http://www.gentoo.org/doc/en/kernel-upgrade.xml"
 	kernel_is_2_6 && einfo "  - 2.4 to 2.6 migration guide: http://www.gentoo.org/doc/en/migration-to-2.6.xml"
-	if kernel_is ge 2 6 13; then
-		ewarn "As of 2.6.13 the support for devfs has been removed."
-		ewarn "You will be required to either manage a static /dev"
-		ewarn "or to ensure that udev is starting on boot."
-	fi
 	echo
 
 	# if K_EXTRAEINFO is set then lets display it now



-- 
gentoo-commits@gentoo.org mailing list