diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37665 -> 37662 bytes | |||
| -rw-r--r-- | eclass/cargo.eclass | 7 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 2 | ||||
| -rw-r--r-- | eclass/verify-sig.eclass | 6 |
4 files changed, 13 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 09db7b5e25ae..d5733bb7b37b 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index c46f48146aed..eb9d2e8c3599 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -243,7 +243,8 @@ cargo_src_unpack() { # @FUNCTION: cargo_live_src_unpack # @DESCRIPTION: -# Runs 'cargo fetch' and vendors downloaded crates for offline use, used in live ebuilds +# Runs 'cargo fetch' and vendors downloaded crates for offline use, used in live ebuilds. +# NOTE: might require passing --frozen to cargo_src_configure if git dependencies are used. cargo_live_src_unpack() { debug-print-function ${FUNCNAME} "$@" @@ -355,6 +356,10 @@ cargo_live_src_unpack() { # In some cases crates may need '--no-default-features' option, # as there is no way to disable single feature, except disabling all. # It can be passed directly to cargo_src_configure(). +# +# Some live/9999 ebuild may need '--frozen' option, if git crates +# are used. +# Otherwise src_install phase may query network again and fail. cargo_src_configure() { debug-print-function ${FUNCNAME} "$@" diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index c18ef21099d1..4942c931f92a 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -377,7 +377,7 @@ handle_genpatches() { UNIPATCH_LIST_GENPATCHES+=" ${DISTDIR}/${tarball}" debug-print "genpatches tarball: ${tarball}" fi - GENPATCHES_URI+=" ${use_cond_start}$(echo https://dev.gentoo.org/~{alicef,mpagano,whissi}/dist/genpatches/${tarball})${use_cond_end}" + GENPATCHES_URI+=" ${use_cond_start}$(echo https://dev.gentoo.org/~{alicef,mpagano}/dist/genpatches/${tarball})${use_cond_end}" done } diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass index 1d7c62d4dce2..394ce2e44427 100644 --- a/eclass/verify-sig.eclass +++ b/eclass/verify-sig.eclass @@ -141,6 +141,9 @@ verify-sig_verify_detached() { einfo "Verifying ${filename} ..." case ${VERIFY_SIG_METHOD} in openpgp) + # gpg can't handle very long TMPDIR + # https://bugs.gentoo.org/854492 + local -x TMPDIR=/tmp gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \ gpg --verify "${sig}" "${file}" || die "PGP signature verification failed" @@ -190,6 +193,9 @@ verify-sig_verify_message() { einfo "Verifying ${filename} ..." case ${VERIFY_SIG_METHOD} in openpgp) + # gpg can't handle very long TMPDIR + # https://bugs.gentoo.org/854492 + local -x TMPDIR=/tmp gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \ gpg --verify --output="${output_file}" "${file}" || die "PGP signature verification failed" |