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