cheribsd: Don't make default kernel -NOCAPREVOKE when enabled

We always want the default to be one with revocation; -NOCAPREVOKE kernels are just extra configs.
CTSRD-CHERI · Dec 4, 2023 · bc2bad3 · bc2bad3
1 parent ca3ec75
commit bc2bad3
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/pycheribuild/projects/cross/cheribsd.py b/pycheribuild/projects/cross/cheribsd.py
@@ -1707,7 +1707,6 @@ def default_kernel_config(self, platform: "Optional[ConfigPlatform]" = None, **f
         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)
-        filter_kwargs.setdefault("nocaprevoke", self.build_nocaprevoke_kernels)
         config = CheriBSDConfigTable.get_default(xtarget, platform, kernel_abi, **filter_kwargs)
         return config.kernconf
 
@@ -1843,7 +1842,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())
-        filter_kwargs.setdefault("nocaprevoke", self.build_nocaprevoke_kernels)
         filter_kwargs["mfsroot"] = True
         config = CheriBSDConfigTable.get_default(self.crosscompile_target, platform, kernel_abi, **filter_kwargs)
         return config.kernconf