diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-12-18 19:50:47 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-18 19:50:47 +0000 |
| commit | 1252b7a51c2cc6bd3a81830544cacce0aefc0bf1 (patch) | |
| tree | 46f7231a8d885b3bd21739910f346623e6d92c86 /eclass | |
| parent | 64602f81dd4ecc257e8c5139f42b902d3555ea78 (diff) | |
gentoo auto-resync : 18:12:2023 - 19:50:47
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38947 -> 38942 bytes | |||
| -rw-r--r-- | eclass/dist-kernel-utils.eclass | 7 | ||||
| -rw-r--r-- | eclass/kernel-build.eclass | 12 | ||||
| -rw-r--r-- | eclass/kernel-install.eclass | 3 |
4 files changed, 16 insertions, 6 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex abf5dd3fd6ab..ed19647a1405 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index 62750d1721a2..67cb802151b2 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -87,6 +87,13 @@ dist-kernel_get_image_path() { echo arch/${ARCH}/boot/Image.gz fi ;; + loong) + if [[ ${KERNEL_EFI_ZBOOT} ]]; then + echo arch/loongarch/boot/vmlinuz.efi + else + echo arch/loongarch/boot/vmlinux.elf + fi + ;; arm) echo arch/arm/boot/zImage ;; diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 6b692dc4f9a0..7a041a8aacdf 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -203,6 +203,12 @@ kernel-build_src_configure() { .config) fi + # 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 + mkdir -p "${WORKDIR}"/modprep || die mv .config "${WORKDIR}"/modprep/ || die emake O="${WORKDIR}"/modprep "${MAKEARGS[@]}" olddefconfig @@ -456,12 +462,6 @@ 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 diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index 22d8ce200016..c7118a720ba6 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -167,6 +167,9 @@ kernel-install_get_qemu_arch() { arm64) echo aarch64 ;; + loong) + echo loongarch64 + ;; *) die "${FUNCNAME}: unsupported ARCH=${ARCH}" ;; |