1 |
> On 22 Jul 2021, at 16:00, Alice <alicef@g.o> wrote: |
2 |
> |
3 |
> |
4 |
> Signed-off-by: Alice Ferrazzi <alicef@g.o> |
5 |
> --- |
6 |
> eclass/kernel-2.eclass | 13 +++++++++---- |
7 |
> 1 file changed, 9 insertions(+), 4 deletions(-) |
8 |
|
9 |
Alice, thanks for taking the initiative to get this done and drop Python 2.7 here. |
10 |
|
11 |
It's much appreciated! |
12 |
|
13 |
> |
14 |
> diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
15 |
> index f94dd9c..05f8161 100644 |
16 |
> --- a/eclass/kernel-2.eclass |
17 |
> +++ b/eclass/kernel-2.eclass |
18 |
> @@ -605,7 +605,7 @@ if [[ ${ETYPE} == sources ]]; then |
19 |
> kernel_is le 2 6 ${DEBLOB_MAX_VERSION} && \ |
20 |
> K_DEBLOB_AVAILABLE=1 |
21 |
> if [[ ${K_DEBLOB_AVAILABLE} == 1 ]]; then |
22 |
> - PYTHON_COMPAT=( python2_7 ) |
23 |
> + PYTHON_COMPAT=( python3_{7..10} ) |
24 |
|
25 |
I think others already said this, but Python 3.7 is a noop (eclasses ignore it), so just drop it. |
26 |
|
27 |
> |
28 |
> inherit python-any-r1 |
29 |
> |
30 |
> @@ -1489,9 +1489,14 @@ kernel-2_src_compile() { |
31 |
> [[ ${ETYPE} == headers ]] && compile_headers |
32 |
> |
33 |
> if [[ ${K_DEBLOB_AVAILABLE} == 1 ]] && use deblob; then |
34 |
> - einfo ">>> Running deblob script ..." |
35 |
> - python_setup |
36 |
> - sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!" |
37 |
> + # deblob less than 5.10 require python 2.7 |
38 |
> + if kernel_is lt 5 10; then |
39 |
> + ewarn "we don't support deblob for kernel less then 5.10" |
40 |
> + else |
41 |
> + einfo ">>> Running deblob script ..." |
42 |
> + python_setup |
43 |
> + sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!" |
44 |
> + fi |
45 |
> fi |
46 |
> } |
47 |
> |
48 |
|
49 |
I'd still prefer it if we just didn't provide the USE flag on irrelevant kernels (it's too confusing) but if you plan on removing this |
50 |
message at some point, I guess we can keep it? |
51 |
|
52 |
best, |
53 |
sam |