[gentoo-dev] [PATCH 1/1] kernel-2.eclass: Remove DEBLOB support.

[Mike Pagano]

Upstream does not version patches and every change breaks the manifest
which
breaks the tree. This results in a constant chasing of bugs since we can't
predict the breakage.

Signed-off-by: Mike Pagano <mpagano@g.o>
---
 eclass/kernel-2.eclass | 102
+------------------------------------------------
 1 file changed, 2 insertions(+), 100 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 0c9ce04..dcf94f4 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -129,26 +129,6 @@
 # If set, this kernel is unsupported by Gentoo Security
 # to the current eclass maintainer :)

-# @ECLASS-VARIABLE:  K_DEBLOB_AVAILABLE	
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# 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".
-
-# @ECLASS-VARIABLE:  K_DEBLOB_TAG     		
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# This will be the version of deblob script. It's a upstream SVN tag
-# such asw -gnu or -gnu1.
-
-# @ECLASS-VARIABLE:  K_PREDEBLOBBED		
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# This kernel was already deblobbed elsewhere.
-# If false, either optional deblobbing will be available
-# or the license will note the inclusion of freedist code.
-
 # @ECLASS-VARIABLE:  K_LONGTERM			
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -219,11 +199,6 @@ HOMEPAGE="https://www.kernel.org/
https://www.gentoo.org/ ${HOMEPAGE}"

 has "${EAPI:-0}" 0 1 2 && ED=${D} EPREFIX= EROOT=${ROOT}

-# 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.
-: ${DEBLOB_MAX_VERSION:=38}
-
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"

@@ -603,59 +578,6 @@ if [[ ${ETYPE} == sources ]]; then
 	DESCRIPTION="Sources based on the Linux Kernel."
 	IUSE="symlink build"

-	# Bug #266157, deblob for libre support
-	if [[ -z ${K_PREDEBLOBBED} ]] ; then
-		# 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
-		if [[ ${K_DEBLOB_AVAILABLE} == "1" ]] ; then
-			IUSE="${IUSE} deblob"
-
-			# Reflect that kernels contain firmware blobs unless otherwise
-			# stripped
-			LICENSE="${LICENSE} !deblob? ( freedist )"
-
-			DEPEND+=" deblob? ( ${PYTHON_DEPS} )"
-
-			if [[ -n KV_MINOR ]]; then
-				DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-			else
-				DEBLOB_PV="${KV_MAJOR}.${KV_PATCH}"
-			fi
-
-			if [[ ${KV_MAJOR} -ge 3 ]]; then
-				DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}"
-			fi
-
-			# deblob svn tag, default is -gnu, to change, use K_DEBLOB_TAG in ebuild
-			K_DEBLOB_TAG=${K_DEBLOB_TAG:--gnu}
-			DEBLOB_A="deblob-${DEBLOB_PV}"
-			DEBLOB_CHECK_A="deblob-check-${DEBLOB_PV}"
-		
DEBLOB_HOMEPAGE="http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags"
-			DEBLOB_URI_PATH="${DEBLOB_PV}${K_DEBLOB_TAG}"
-			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_URI}
-					${DEBLOB_CHECK_URI}
-				)"
-		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"
 	IUSE="crosscompile_opts_headers-only"
@@ -999,14 +921,6 @@ postinst_sources() {
 	# if we have USE=symlink, then force K_SYMLINK=1
 	use symlink && K_SYMLINK=1

-	# We do support security on a deblobbed kernel, bug #555878.
-	# If some particular kernel version doesn't have security
-	# supported because of USE=deblob or otherwise, one can still
-	# set K_SECURITY_UNSUPPORTED on a per ebuild basis.
-	#[[ $K_DEBLOB_AVAILABLE == 1 ]] && \
-	#	use deblob && \
-	#	K_SECURITY_UNSUPPORTED=deblob
-
 	# if we are to forcably symlink, delete it if it already exists first.
 	if [[ ${K_SYMLINK} > 0 ]]; then
 		[[ -h ${EROOT}usr/src/linux ]] && { rm "${EROOT}"usr/src/linux || die; }
@@ -1439,7 +1353,7 @@ headers___fix() {
 # @FUNCTION: kernel-2_src_unpack()
 # @USAGE:
 # @DESCRIPTION:
-# unpack sources, handle genpatches, deblob
+# unpack sources, handle genpatches

 kernel-2_src_unpack() {
 	universal_unpack
@@ -1478,12 +1392,6 @@ kernel-2_src_unpack() {
 		kernel_is 2 6 && unpack_2_6
 	fi

-	if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then
-		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
-
 	# 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
@@ -1517,17 +1425,11 @@ kernel-2_src_prepare() {
 # @FUNCTION: kernel-2_src_compile
 # @USAGE:
 # @DESCRIPTION:
-# conpile headers or run deblob script
+# conpile headers

 kernel-2_src_compile() {
 	cd "${S}"
 	[[ ${ETYPE} == headers ]] && compile_headers
-
-	if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then
-		echo ">>> Running deblob script ..."
-		python_setup
-		sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!"
-	fi
 }

 # @FUNCTION: kernel-2_src_test
-- 
2.10.2