From 4e1f838d50d1c4c60cd4498509d253f345220408 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Wed, 14 Feb 2024 04:55:05 +0000 Subject: [PATCH] cheribsd: Don't prioritise FETT kernel over non-FETT --cheribsd/build-fett-kernels should only add extra kernels, like other options, rather than override the default one. Also we should order the kernels in _get_config_variants by flag disabled before enabled, though that doesn't really matter so long as the default is correct. --- pycheribuild/projects/cross/cheribsd.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pycheribuild/projects/cross/cheribsd.py b/pycheribuild/projects/cross/cheribsd.py index d7bf777a8..e903354ef 100644 --- a/pycheribuild/projects/cross/cheribsd.py +++ b/pycheribuild/projects/cross/cheribsd.py @@ -1657,7 +1657,7 @@ def get_default_kernel_abi(self) -> KernelABI: def _get_config_variants(self, platforms: "set[ConfigPlatform]", kernel_abis: "list[KernelABI]", combine_flags: "list[str]", **filter_kwargs) -> "list[CheriBSDConfig]": - flag_values = itertools.product([True, False], repeat=len(combine_flags)) + flag_values = itertools.product([False, True], repeat=len(combine_flags)) combine_tuples = list(itertools.product(platforms, kernel_abis, flag_values)) configs = [] for platform, kernel_abi, flag_tuple in combine_tuples: @@ -1704,8 +1704,6 @@ def default_kernel_config(self, platform: "Optional[ConfigPlatform]" = None, **f if platform is None: platform = self.get_default_kernel_platform() kernel_abi = filter_kwargs.pop("kernel_abi", self.get_default_kernel_abi()) - if xtarget.is_riscv(include_purecap=True): - filter_kwargs.setdefault("fett", self.build_fett_kernels) config = CheriBSDConfigTable.get_default(xtarget, platform, kernel_abi, **filter_kwargs) return config.kernconf