diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-08-07 14:12:01 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-07 14:12:01 +0100 |
| commit | 32c7b79bcc8a67e6bc6516adbc729e83f957a368 (patch) | |
| tree | 21df31dc0deb9c9cf559e956049f83a09bc2fa08 /eclass | |
| parent | 79b62a1562ef813f413bc8facf13c063e5196c02 (diff) | |
gentoo auto-resync : 07:08:2022 - 14:12:00
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36992 -> 36986 bytes | |||
| -rw-r--r-- | eclass/kernel-2.eclass | 14 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 128ccbc029e1..cba1026eb1d7 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index b3fb5cef76c3..50464470a9bb 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -675,15 +675,7 @@ if [[ ${ETYPE} == sources ]]; then # Bug #266157, deblob for libre support if [[ -z ${K_PREDEBLOBBED} ]]; then - # deblob less than 5.10 require python 2.7 - if kernel_is lt 5 10; then - K_DEBLOB_AVAILABLE=0 - fi if [[ ${K_DEBLOB_AVAILABLE} == 1 ]]; then - PYTHON_COMPAT=( python3_{8..10} ) - - inherit python-any-r1 - IUSE="${IUSE} deblob" # Reflect that kernels contain firmware blobs unless otherwise @@ -691,8 +683,6 @@ if [[ ${ETYPE} == sources ]]; then # tree has been dropped from the kernel. kernel_is lt 4 14 && LICENSE+=" !deblob? ( linux-firmware )" - BDEPEND+=" deblob? ( ${PYTHON_DEPS} )" - if [[ -n KV_MINOR ]]; then DEBLOB_PV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" else @@ -1470,8 +1460,10 @@ kernel-2_src_compile() { cd "${S}" || die if [[ ${K_DEBLOB_AVAILABLE} == 1 ]] && use deblob; then + einfo ">>> Patching deblob script for forcing awk ..." + sed -i '/check="\/bin\/sh $check"/a \ check="$check --use-awk"' \ + "${T}/${DEBLOB_A}" || die "Failed to patch ${DEBLOB_A}" einfo ">>> Running deblob script ..." - python_setup sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!" fi } diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index a1093e0fb603..fe1e209fb2d5 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -371,11 +371,14 @@ if [[ ${TOOLCHAIN_SET_S} == yes ]] ; then fi gentoo_urls() { + # the list is sorted by likelihood of getting the patches tarball from + # respective devspace # slyfox's distfiles are mirrored to sam's devspace declare -A devspace_urls=( [soap]=HTTP~soap/distfiles/URI [sam]=HTTP~sam/distfiles/sys-devel/gcc/URI [slyfox]=HTTP~sam/distfiles/URI + [xen0n]=HTTP~xen0n/distfiles/sys-devel/gcc/URI [tamiko]=HTTP~tamiko/distfiles/URI [zorry]=HTTP~zorry/patches/gcc/URI [vapier]=HTTP~vapier/dist/URI |