| 1 |
On Fri, 2021-07-23 at 00:00 +0900, Alice wrote: |
| 2 |
> Signed-off-by: Alice Ferrazzi <alicef@g.o> |
| 3 |
> --- |
| 4 |
> eclass/kernel-2.eclass | 13 +++++++++---- |
| 5 |
> 1 file changed, 9 insertions(+), 4 deletions(-) |
| 6 |
> |
| 7 |
> diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
| 8 |
> index f94dd9c..05f8161 100644 |
| 9 |
> --- a/eclass/kernel-2.eclass |
| 10 |
> +++ b/eclass/kernel-2.eclass |
| 11 |
> @@ -605,7 +605,7 @@ if [[ ${ETYPE} == sources ]]; then |
| 12 |
> kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ |
| 13 |
> K_DEBLOB_AVAILABLE=1 |
| 14 |
> if [[ ${K_DEBLOB_AVAILABLE} == 1 ]]; then |
| 15 |
> - PYTHON_COMPAT=( python2_7 ) |
| 16 |
> + PYTHON_COMPAT=( python3_{7..10} ) |
| 17 |
> |
| 18 |
> inherit python-any-r1 |
| 19 |
> |
| 20 |
> @@ -1489,9 +1489,14 @@ kernel-2_src_compile() { |
| 21 |
> [[ ${ETYPE} == headers ]] && compile_headers |
| 22 |
> |
| 23 |
> if [[ ${K_DEBLOB_AVAILABLE} == 1 ]] && use deblob; then |
| 24 |
> - einfo ">>> Running deblob script ..." |
| 25 |
> - python_setup |
| 26 |
> - sh "${T}/${DEBLOB_A}" --force || die "Deblob script |
| 27 |
> failed to run!!!" |
| 28 |
> + # deblob less than 5.10 require python 2.7 |
| 29 |
> + if kernel_is lt 5 10; then |
| 30 |
> + ewarn "we don't support deblob for kernel less |
| 31 |
> then 5.10" |
| 32 |
|
| 33 |
Why are you adding the USE flag for these kernels then? It's misleading |
| 34 |
at best. |
| 35 |
|
| 36 |
> + else |
| 37 |
> + einfo ">>> Running deblob script ..." |
| 38 |
> + python_setup |
| 39 |
> + sh "${T}/${DEBLOB_A}" --force || die "Deblob |
| 40 |
> script failed to run!!!" |
| 41 |
> + fi |
| 42 |
> fi |
| 43 |
> } |
| 44 |
> |
| 45 |
|
| 46 |
-- |
| 47 |
Best regards, |
| 48 |
Michał Górny |
Archives