diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2025-03-29 00:32:16 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2025-03-29 00:32:16 +0000 |
| commit | ad108e7b751d67723534624b94eb0e04250dd1af (patch) | |
| tree | b2c2e47b9c23ac5a70d7170b3ba364b32da31944 /eclass | |
| parent | c44ae5c03130467400468d0e9a7f83e723c99f35 (diff) | |
gentoo auto-resync : 29:03:2025 - 00:32:15
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 40354 -> 40356 bytes | |||
| -rw-r--r-- | eclass/flag-o-matic.eclass | 2 | ||||
| -rw-r--r-- | eclass/kernel-build.eclass | 15 |
3 files changed, 9 insertions, 8 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 4e16015ede41..6e3dbeb0475f 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 9590192bb1f4..4765809e9118 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -77,7 +77,7 @@ _setup-allowed-flags() { -ggdb '-ggdb[0-9]' -gdwarf '-gdwarf-*' -gstabs -gstabs+ - -gz + -gz '-gz=*' -glldb '-fdebug-default-version=*' diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 65433d9fc9c0..1d8c396b9590 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -741,18 +741,19 @@ kernel-build_merge_configs() { fi if [[ ${KERNEL_IUSE_MODULES_SIGN} ]] && use modules-sign; then + local modules_sign_key=${MODULES_SIGN_KEY} if [[ -n ${MODULES_SIGN_KEY_CONTENTS} ]]; then - (umask 066 && touch "${T}/kernel_key.pem" || die) - echo "${MODULES_SIGN_KEY_CONTENTS}" > "${T}/kernel_key.pem" || die + modules_sign_key="${T}/kernel_key.pem" + (umask 066 && touch "${modules_sign_key}" || die) + echo "${MODULES_SIGN_KEY_CONTENTS}" > "${modules_sign_key}" || die unset MODULES_SIGN_KEY_CONTENTS - export 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}\"" \ + if [[ ${modules_sign_key} == pkcs11:* || -r ${modules_sign_key} ]]; then + echo "CONFIG_MODULE_SIG_KEY=\"${modules_sign_key}\"" \ >> "${WORKDIR}/modules-sign-key.config" merge_configs+=( "${WORKDIR}/modules-sign-key.config" ) - elif [[ -n ${MODULES_SIGN_KEY} ]]; then - die "MODULES_SIGN_KEY=${MODULES_SIGN_KEY} not found or not readable!" + elif [[ -n ${modules_sign_key} ]]; then + die "MODULES_SIGN_KEY=${modules_sign_key} not found or not readable!" fi fi |