diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-09-04 16:21:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-04 16:21:31 +0100 |
| commit | 0979d3ddb6ea14d17e52fd0ba2e01f928948384a (patch) | |
| tree | 9d4f2f4d6cb3f7f6c2d65c815a075aa8ac3e52e0 /eclass | |
| parent | a8a8a3282ed1a28dd4ba31bc9b19914f25761abe (diff) | |
gentoo auto-resync : 04:09:2023 - 16:21:31
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38506 -> 38495 bytes | |||
| -rw-r--r-- | eclass/dist-kernel-utils.eclass | 9 | ||||
| -rw-r--r-- | eclass/kernel-build.eclass | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 785335ae3cd5..5a781f355e57 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index 1a55424a97ef..67ae2f7b510d 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -19,6 +19,13 @@ # If set to a non-null value, inherits secureboot.eclass # and allows signing of generated kernel images. +# @ECLASS_VARIABLE: KERNEL_EFI_ZBOOT +# @DEFAULT_UNSET +# @DESCRIPTION: +# If set to a non-null value, it is assumed the kernel was built with +# CONFIG_EFI_ZBOOT enabled. This effects the name of the kernel image on +# arm64 and riscv. Mainly useful for sys-kernel/gentoo-kernel-bin. + if [[ ! ${_DIST_KERNEL_UTILS} ]]; then case ${EAPI} in @@ -72,7 +79,7 @@ dist-kernel_get_image_path() { echo arch/x86/boot/bzImage ;; arm64|riscv) - if [[ ${KERNEL_IUSE_SECUREBOOT} ]] && use secureboot; then + if [[ ${KERNEL_EFI_ZBOOT} ]]; then echo arch/${ARCH}/boot/vmlinuz.efi else echo arch/${ARCH}/boot/Image.gz diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 0c40e8033fe2..0618d495f343 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -461,6 +461,12 @@ kernel-build_merge_configs() { ./scripts/kconfig/merge_config.sh -m -r \ .config "${merge_configs[@]}" || die + + # If this is set by USE=secureboot or user config this will have an effect + # on the name of the output image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" .config; then + KERNEL_EFI_ZBOOT=1 + fi } fi |