sys-kernel/vanilla-kernel: 5.x.y.9999 drop zboot and broken workaround

Signed-off-by: Nowa Ammerlaan <nowa@gentoo.org>
This commit is contained in:
Nowa Ammerlaan
2025-08-18 17:32:10 +02:00
parent 0399387ff2
commit f4415c5448
2 changed files with 2 additions and 14 deletions

View File

@@ -126,13 +126,7 @@ src_prepare() {
merge_configs+=( "${dist_conf_path}/big-endian.config" )
fi
use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config"
"${dist_conf_path}/zboot.config"
)
# 5.10 series: No ZBOOT, disable explicitly to not confuse the eclass
echo "# CONFIG_EFI_ZBOOT is not set" >> "${dist_conf_path}/secureboot.config" || die
use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
kernel-build_merge_configs "${merge_configs[@]}"
}

View File

@@ -130,13 +130,7 @@ src_prepare() {
merge_configs+=( "${dist_conf_path}/big-endian.config" )
fi
use secureboot && merge_configs+=(
"${dist_conf_path}/secureboot.config"
"${dist_conf_path}/zboot.config"
)
# 5.15 series: No ZBOOT, disable explicitly to not confuse the eclass
echo "# CONFIG_EFI_ZBOOT is not set" >> "${dist_conf_path}/secureboot.config" || die
use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
kernel-build_merge_configs "${merge_configs[@]}"
}