1 |
commit: 20028157ec958fae597441a534b3f045fe2606f3 |
2 |
Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 27 09:16:31 2022 +0000 |
4 |
Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 7 09:56:29 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20028157 |
7 |
|
8 |
kernel-2.eclass: Force deblob-check to use awk |
9 |
|
10 |
This patch remove python from the kernel-2.eclass |
11 |
by forcing the deblob-check script to use awk instead |
12 |
of python. |
13 |
|
14 |
Closes: https://bugs.gentoo.org/610008 |
15 |
|
16 |
Signed-off-by: Alice Ferrazzi <alicef <AT> gentoo.org> |
17 |
|
18 |
eclass/kernel-2.eclass | 14 +++----------- |
19 |
1 file changed, 3 insertions(+), 11 deletions(-) |
20 |
|
21 |
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass |
22 |
index b3fb5cef76c3..50464470a9bb 100644 |
23 |
--- a/eclass/kernel-2.eclass |
24 |
+++ b/eclass/kernel-2.eclass |
25 |
@@ -675,15 +675,7 @@ if [[ ${ETYPE} == sources ]]; then |
26 |
|
27 |
# Bug #266157, deblob for libre support |
28 |
if [[ -z ${K_PREDEBLOBBED} ]]; then |
29 |
- # deblob less than 5.10 require python 2.7 |
30 |
- if kernel_is lt 5 10; then |
31 |
- K_DEBLOB_AVAILABLE=0 |
32 |
- fi |
33 |
if [[ ${K_DEBLOB_AVAILABLE} == 1 ]]; then |
34 |
- PYTHON_COMPAT=( python3_{8..10} ) |
35 |
- |
36 |
- inherit python-any-r1 |
37 |
- |
38 |
IUSE="${IUSE} deblob" |
39 |
|
40 |
# Reflect that kernels contain firmware blobs unless otherwise |
41 |
@@ -691,8 +683,6 @@ if [[ ${ETYPE} == sources ]]; then |
42 |
# tree has been dropped from the kernel. |
43 |
kernel_is lt 4 14 && LICENSE+=" !deblob? ( linux-firmware )" |
44 |
|
45 |
- BDEPEND+=" deblob? ( ${PYTHON_DEPS} )" |
46 |
- |
47 |
if [[ -n KV_MINOR ]]; then |
48 |
DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" |
49 |
else |
50 |
@@ -1470,8 +1460,10 @@ kernel-2_src_compile() { |
51 |
cd "${S}" || die |
52 |
|
53 |
if [[ ${K_DEBLOB_AVAILABLE} == 1 ]] && use deblob; then |
54 |
+ einfo ">>> Patching deblob script for forcing awk ..." |
55 |
+ sed -i '/check="\/bin\/sh $check"/a \ check="$check --use-awk"' \ |
56 |
+ "${T}/${DEBLOB_A}" || die "Failed to patch ${DEBLOB_A}" |
57 |
einfo ">>> Running deblob script ..." |
58 |
- python_setup |
59 |
sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!" |
60 |
fi |
61 |
} |