diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38929 -> 38932 bytes | |||
| -rw-r--r-- | eclass/aspell-dict-r1.eclass | 7 | ||||
| -rw-r--r-- | eclass/kernel-build.eclass | 17 |
3 files changed, 12 insertions, 12 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex b2a8dc8f3213..a2e4ef016fbd 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass index 170edb4cacde..1a3bd0b21b24 100644 --- a/eclass/aspell-dict-r1.eclass +++ b/eclass/aspell-dict-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: aspell-dict-r1.eclass @@ -58,7 +58,6 @@ SLOT="0" RDEPEND="app-text/aspell" DEPEND="${RDEPEND}" -BDEPEND="sys-apps/which" _ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-6} [[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "Unsupported ASPELL_VERSION=${ASPELL_VERSION}" @@ -68,6 +67,10 @@ unset _ASPELL_MAJOR_VERSION # @DESCRIPTION: # The aspell-dict-r1 src_configure function which is exported. aspell-dict-r1_src_configure() { + # configure generates lines like: + # `echo "ASPELL = `which $ASPELL`" > Makefile` + sed -i -e '/.* = `which/ s:`which:`command -v:' configure || die + # Since it's a non-autoconf based script, 'econf' cannot be used. ./configure || die } diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 6f18bc1dc969..4f7e4d047739 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -114,16 +114,6 @@ kernel-build_pkg_setup() { python-any-r1_pkg_setup if [[ ${KERNEL_IUSE_MODULES_SIGN} ]]; then secureboot_pkg_setup - if [[ -e ${MODULES_SIGN_KEY} && ${MODULES_SIGN_KEY} != pkcs11:* ]]; then - if [[ -e ${MODULES_SIGN_CERT} && ${MODULES_SIGN_CERT} != ${MODULES_SIGN_KEY} ]]; then - cat "${MODULES_SIGN_CERT}" "${MODULES_SIGN_KEY}" > "${T}/kernel_key.pem" || die - else - cp "${MODULES_SIGN_KEY}" "${T}/kernel_key.pem" || die - fi - chown portage:portage "${T}/kernel_key.pem" || die - chmod 0400 "${T}/kernel_key.pem" || die - export MODULES_SIGN_KEY="${T}/kernel_key.pem" - fi fi } @@ -437,6 +427,13 @@ kernel-build_merge_configs() { CONFIG_MODULE_SIG_FORCE=y CONFIG_MODULE_SIG_${MODULES_SIGN_HASH^^}=y EOF + if [[ -e ${MODULES_SIGN_KEY} && -e ${MODULES_SIGN_CERT} && + ${MODULES_SIGN_KEY} != ${MODULES_SIGN_CERT} && + ${MODULES_SIGN_KEY} != pkcs11:* ]] + then + cat "${MODULES_SIGN_CERT}" "${MODULES_SIGN_KEY}" > "${T}/kernel_key.pem" || die + MODULES_SIGN_KEY="${T}/kernel_key.pem" + fi if [[ ${MODULES_SIGN_KEY} == pkcs11:* || -r ${MODULES_SIGN_KEY} ]]; then echo "CONFIG_MODULE_SIG_KEY=\"${MODULES_SIGN_KEY}\"" \ >> "${WORKDIR}/modules-sign.config" |