config-qubes: remove STRUCTLEAK configs for Fedora 37

See torvalds/linux@8bd51a2 (cherry picked from commit 9c483f0)
QubesOS · Jan 20, 2023 · 0e4ec6b · 0e4ec6b
1 parent de707ba
commit 0e4ec6b
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/kernel.spec.in b/kernel.spec.in
@@ -191,6 +191,13 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \
 
 cd %kernel_build_dir
 
+# FIXME: Find a modular way to include configuration per dist
+# On GCC12+, STRUCTLEAK configs are not needed anymore
+%if 0%{?fedora} >= 37
+sed -i '/CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y/d' %{SOURCE101}
+sed -i 's/CONFIG_GCC_PLUGIN_STRUCTLEAK=y/CONFIG_INIT_STACK_ALL_ZERO=y/' %{SOURCE101}
+%endif
+
 # Create QubesOS config kernel
 %{SOURCE34} %{SOURCE100} %{SOURCE101}