diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-11-26 22:31:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-26 22:31:32 +0000 |
| commit | 161eaa4b12ca6314376288834bba20b7824d0d77 (patch) | |
| tree | bf1cf8dcc890afa687bdad1e4454b7668dc78316 /eclass/kernel-build.eclass | |
| parent | b4f6e628608bc652784357168671425b3212457e (diff) | |
gentoo auto-resync : 26:11:2023 - 22:31:32
Diffstat (limited to 'eclass/kernel-build.eclass')
| -rw-r--r-- | eclass/kernel-build.eclass | 17 |
1 files changed, 7 insertions, 10 deletions
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" |