[gentoo-dev] [PATCH] Clean deblob

[gentoo-dev] [PATCH] Clean deblob

[Alice Ferrazzi]

As we are moving out to deprecate EAPI=6 from kernel-2.eclass
start removing it from deblob function. Also clean code linked to old
kernel versions. kernel sources that use deblob are already updated to
EAPI=8

Signed-off-by: Alice Ferrazzi <alicef@gentoo.org>
---
 eclass/kernel-2.eclass | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 58e0bae94e..36e081541e 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -220,11 +220,6 @@ fi
 HOMEPAGE="https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel ${HOMEPAGE}"
 : ${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.
-: ${DEBLOB_MAX_VERSION:=38}
-
 # No need to run scanelf/strip on kernel sources/headers (bug #134453).
 RESTRICT="binchecks strip"
 
@@ -600,11 +595,6 @@ if [[ ${ETYPE} == sources ]]; then
 
 	# 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
 		# deblob less than 5.10 require python 2.7
 		if kernel_is lt 5 10; then
 			K_DEBLOB_AVAILABLE=0
@@ -621,7 +611,6 @@ if [[ ${ETYPE} == sources ]]; then
 			# tree has been dropped from the kernel.
 			kernel_is lt 4 14 && LICENSE+=" !deblob? ( linux-firmware )"
 
-			[[ ${EAPI} == 6 ]] && DEPEND+=" deblob? ( ${PYTHON_DEPS} )" ||
 			BDEPEND+=" deblob? ( ${PYTHON_DEPS} )"
 
 			if [[ -n KV_MINOR ]]; then
-- 
2.25.3

Re: [gentoo-dev] [PATCH] Clean deblob

[Ulrich Mueller]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

>>>>> On Thu, 26 Aug 2021, Alice Ferrazzi wrote:

> As we are moving out to deprecate EAPI=6 from kernel-2.eclass
> start removing it from deblob function. Also clean code linked to old
> kernel versions. kernel sources that use deblob are already updated to
> EAPI=8

Somewhat unrelated, since I see calls to kernel_is() in your patch:

That function has a horrible hack for version comparison:

    : $(( test = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH ))
    : $(( value = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} ))
    [ ${test} ${operator} ${value} ]

There are versions like gentoo-sources-4.9.280, so the shift by 8 may
cause surprising results.

I'll send a patch later.

Ulrich

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]