diff options
| author |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-07-21 17:44:32 +0200 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-07-21 17:45:23 +0200 |
| commit | fa77d52a7ff39464c50707ca024725deab08b534 (patch) | |
| tree | 0e8c89d710069b9f3576672bc60cfba5ff9671d8 /eclass/kernel-build.eclass | |
| parent | net-mail/courier-common: destabilize 3.1.5 for ~hppa (diff) | |
| download | gentoo-fa77d52a7ff39464c50707ca024725deab08b534.tar.gz gentoo-fa77d52a7ff39464c50707ca024725deab08b534.tar.bz2 gentoo-fa77d52a7ff39464c50707ca024725deab08b534.zip | |
kernel-build.eclass: support unset MODULES_SIGN_{CERT,KEY}
the kernel build system generates a key if not set, so don't check anything
if the key is unset
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'eclass/kernel-build.eclass')
| -rw-r--r-- | eclass/kernel-build.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index cbc80bddf6f7..be0256c21102 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -134,7 +134,7 @@ kernel-build_pkg_setup() { if [[ ${KERNEL_IUSE_MODULES_SIGN} && ${MERGE_TYPE} != binary ]]; then secureboot_pkg_setup - if use modules-sign; then + if use modules-sign && [[ -n ${MODULES_SIGN_KEY} ]]; then # Sanity check: fail early if key/cert in DER format or does not exist local openssl_args=( -noout -nocert @@ -155,7 +155,7 @@ kernel-build_pkg_setup() { die "Kernel module signing certificate or key not found or not PEM format." if [[ ${MODULES_SIGN_KEY} != pkcs11:* ]]; then - if [[ ${MODULES_SIGN_CERT} != ${MODULES_SIGN_KEY} ]]; then + if [[ -n ${MODULES_SIGN_CERT} && ${MODULES_SIGN_CERT} != ${MODULES_SIGN_KEY} ]]; then MODULES_SIGN_KEY_CONTENTS="$(cat "${MODULES_SIGN_CERT}" "${MODULES_SIGN_KEY}" || die)" else MODULES_SIGN_KEY_CONTENTS="$(< "${MODULES_SIGN_KEY}")" |