[patch] kernel-2.eclass modified to use deblob-check [diff] [2nd try]

kernel-2.eclass.patch (text/plain), 1.21 KB, created by Nick White on 2010-08-02 12:43:08 UTC

--- kernel-2.eclass.orig	2010-08-02 13:29:39.206975569 +0100
+++ kernel-2.eclass	2010-08-02 13:46:39.096872558 +0100
@@ -339,11 +339,17 @@
 			DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
 			DEBLOB_A="deblob-${DEBLOB_PV}"
 			DEBLOB_HOMEPAGE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
+			if [[ $EAPI -ge 2 ]] ; then
+				DEBLOB_CURI="${DEBLOB_HOMEPAGE}/download/releases/LATEST-${DEBLOB_PV}.N/deblob-check -> deblob-check-${DEBLOB_PV}"
+			else
+				DEBLOB_CURI="mirror://gentoo/deblob-check-${DEBLOB_PV}"
+			fi
 			HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}"
 				
 			KERNEL_URI="${KERNEL_URI}
 				deblob? (
 					${DEBLOB_HOMEPAGE}/download/releases/LATEST-${DEBLOB_PV}.N/${DEBLOB_A}
+					${DEBLOB_CURI}
 				)"
 		else
 			# We have no way to deblob older kernels, so just mark them as
@@ -1125,8 +1131,9 @@
 	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-${DEBLOB_PV}" "${T}/deblob-check" || die "cp deblob-check-${DEBLOB_PV} failed"
+		chmod +x "${T}/${DEBLOB_A}" "${T}/deblob-check" || die "chmod deblob scripts failed"
 	fi
 }