| 1 |
As we are moving out to deprecate EAPI=6 from kernel-2.eclass |
| 2 |
start removing it from deblob function. Also clean code linked to old |
| 3 |
kernel versions. kernel sources that use deblob are already updated to |
| 4 |
EAPI=8 |
| 5 |
|
| 6 |
Signed-off-by: Alice Ferrazzi <alicef@g.o> |
| 7 |
--- |
| 8 |
eclass/kernel-2.eclass | 11 ----------- |
| 9 |
1 file changed, 11 deletions(-) |
| 10 |
|
| 11 |
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
| 12 |
index 58e0bae94e..36e081541e 100644 |
| 13 |
--- a/eclass/kernel-2.eclass |
| 14 |
+++ b/eclass/kernel-2.eclass |
| 15 |
@@ -220,11 +220,6 @@ fi |
| 16 |
HOMEPAGE="https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel ${HOMEPAGE}" |
| 17 |
: ${LICENSE:="GPL-2"} |
| 18 |
|
| 19 |
-# This is the latest KV_PATCH of the deblob tool available from the |
| 20 |
-# libre-sources upstream. If you bump this, you MUST regenerate the Manifests |
| 21 |
-# for ALL kernel-2 consumer packages where deblob is available. |
| 22 |
-: ${DEBLOB_MAX_VERSION:=38} |
| 23 |
- |
| 24 |
# No need to run scanelf/strip on kernel sources/headers (bug #134453). |
| 25 |
RESTRICT="binchecks strip" |
| 26 |
|
| 27 |
@@ -600,11 +595,6 @@ if [[ ${ETYPE} == sources ]]; then |
| 28 |
|
| 29 |
# Bug #266157, deblob for libre support |
| 30 |
if [[ -z ${K_PREDEBLOBBED} ]]; then |
| 31 |
- # Bug #359865, force a call to detect_version if needed |
| 32 |
- kernel_is ge 2 6 27 && \ |
| 33 |
- [[ -z ${K_DEBLOB_AVAILABLE} ]] && \ |
| 34 |
- kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ |
| 35 |
- K_DEBLOB_AVAILABLE=1 |
| 36 |
# deblob less than 5.10 require python 2.7 |
| 37 |
if kernel_is lt 5 10; then |
| 38 |
K_DEBLOB_AVAILABLE=0 |
| 39 |
@@ -621,7 +611,6 @@ if [[ ${ETYPE} == sources ]]; then |
| 40 |
# tree has been dropped from the kernel. |
| 41 |
kernel_is lt 4 14 && LICENSE+=" !deblob? ( linux-firmware )" |
| 42 |
|
| 43 |
- [[ ${EAPI} == 6 ]] && DEPEND+=" deblob? ( ${PYTHON_DEPS} )" || |
| 44 |
BDEPEND+=" deblob? ( ${PYTHON_DEPS} )" |
| 45 |
|
| 46 |
if [[ -n KV_MINOR ]]; then |
| 47 |
-- |
| 48 |
2.25.3 |
Archives