[patch] kernel-2.eclass.diff

kernel-2.eclass.diff (text/plain), 2.69 KB, created by Peter Hyman on 2006-06-10 04:14:02 UTC

--- /home/peter/tmp/kernel-2.eclass	2006-06-10 06:59:53.000000000 -0400
+++ ./kernel-2.eclass	2006-06-10 07:04:27.000000000 -0400
@@ -33,6 +33,9 @@
 #						  postinst and can be used to carry additional postinst
 #						  messages
 # K_EXTRAEWARN			- same as K_EXTRAEINFO except ewarn's instead of einfo's
+# K_EXTRAEINFO_F and	- these _F variables will use echo -e so that line
+# K_EXTRAEWARN_F		  formatting line \n or \t can be used. Line breaks will
+#						  override what the fmt command would do.
 # K_SYMLINK				- if this is set, then forcably create symlink anyway
 #
 # K_DEFCONFIG			- Allow specifying a different defconfig target.
@@ -48,6 +51,8 @@
 
 # UNIPATCH_LIST			- space delimetered list of patches to be applied to the
 #						  kernel
+# UNIPATCH_GENPATCHES_LAST	- if set, genpatches will be applied after any local
+#						  patches.
 # UNIPATCH_EXCLUDE		- an addition var to support exlusion based completely
 #						  on "<passedstring>*" and not "<passedno#>_*"
 #						- this should _NOT_ be used from the ebuild as this is
@@ -666,11 +671,23 @@
 		while read -s ELINE; do	einfo "${ELINE}"; done
 	fi
 
+	# print with format
+	if [[ -n ${K_EXTRAEINFO_F} ]]; then
+		echo -e ${K_EXTRAEINFO_F} | fmt -w75 -s |
+		while read -s ELINE; do	einfo "${ELINE}"; done
+	fi
+
 	# if K_EXTRAEWARN is set then lets display it now
 	if [[ -n ${K_EXTRAEWARN} ]]; then
 		echo ${K_EXTRAEWARN} | fmt |
 		while read -s ELINE; do ewarn "${ELINE}"; done
 	fi
+	
+	# print with format
+	if [[ -n ${K_EXTRAEWARN_F} ]]; then
+		echo -e ${K_EXTRAEWARN_F} | fmt -w75 -s |
+		while read -s ELINE; do ewarn "${ELINE}"; done
+	fi
 }
 
 postinst_headers() {
@@ -956,8 +973,8 @@
 	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.
+		echo "/* All asm/ files are generated and point to the corresponding 
+* file in asm-sparc or asm-sparc64.
  */
 
 #ifndef __SPARCSTUB__${name}__
@@ -1012,8 +1029,15 @@
 	universal_unpack
 	debug-print "Doing unipatch"
 
-	[[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_DEFAULT} || -n ${UNIPATCH_LIST_GENPATCHES} ]] && \
-		unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}"
+	if [[ -n ${UNIPATCH_LIST} || -n ${UNIPATCH_LIST_DEFAULT} || -n 	${UNIPATCH_LIST_GENPATCHES} ]] ; then
+		if [ -z ${UNIPATCH_GENPATCHES_LAST} ] ; then
+			# normal behavior
+			unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST_GENPATCHES} ${UNIPATCH_LIST}"
+		else
+			# reverse order, genpatches last
+			unipatch "${UNIPATCH_LIST_DEFAULT} ${UNIPATCH_LIST} ${UNIPATCH_LIST_GENPATCHES}"
+		fi
+	fi
 
 	debug-print "Doing premake"