From 6cc927e76bffc1176bd888f527020e8985096747 Mon Sep 17 00:00:00 2001 From: Nicolas Frayer Date: Wed, 17 Jan 2024 21:20:45 +0100 Subject: [PATCH] Compiler flags: ignore incompatible types for now as it prevents CI builds Signed-off-by: Nicolas Frayer --- ...nore-warnings-for-incompatible-types.patch | 28 +++++++++++++++++++ grub.patches | 1 + grub2.spec | 6 +++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0349-Ignore-warnings-for-incompatible-types.patch diff --git a/0349-Ignore-warnings-for-incompatible-types.patch b/0349-Ignore-warnings-for-incompatible-types.patch new file mode 100644 index 0000000..73e9910 --- /dev/null +++ b/0349-Ignore-warnings-for-incompatible-types.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nicolas Frayer +Date: Wed, 17 Jan 2024 21:15:14 +0100 +Subject: [PATCH] Ignore warnings for incompatible types + +Add -Wno-incompatible-pointer-types to ignore warnings for incompatible +types + +Signed-off-by: Nicolas Frayer +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 79f45ef1e14c..b66e07c67851 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2009,8 +2009,8 @@ if test x"$enable_wextra" != xno ; then + HOST_CFLAGS="$HOST_CFLAGS -Wextra" + fi + +-TARGET_CFLAGS="$TARGET_CFLAGS -Werror=trampolines -fno-trampolines" +-HOST_CFLAGS="$HOST_CFLAGS -Werror=trampolines -fno-trampolines" ++TARGET_CFLAGS="$TARGET_CFLAGS -Werror=trampolines -fno-trampolines -Wno-incompatible-pointer-types" ++HOST_CFLAGS="$HOST_CFLAGS -Werror=trampolines -fno-trampolines -Wno-incompatible-pointer-types" + + TARGET_CPP="$TARGET_CC -E" + TARGET_CCAS=$TARGET_CC diff --git a/grub.patches b/grub.patches index caf506f..addf3e5 100644 --- a/grub.patches +++ b/grub.patches @@ -346,3 +346,4 @@ Patch0345: 0345-fs-xfs-Add-large-extent-counters-incompat-feature-su.patch Patch0346: 0346-chainloader-remove-device-path-debug-message.patch Patch0347: 0347-normal-Remove-grub_env_set-prefix-in-grub_try_normal.patch Patch0348: 0348-add-flag-to-only-search-root-dev.patch +Patch0349: 0349-Ignore-warnings-for-incompatible-types.patch diff --git a/grub2.spec b/grub2.spec index 2929175..34a3c8f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 116%{?dist} +Release: 117%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPL-3.0-or-later URL: http://www.gnu.org/software/grub/ @@ -554,6 +554,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Wed Jan 17 2024 Nicolas Frayer - 2.06-117 +- Compiler flags: ignore incompatible types for now as it prevents +CI builds + * Wed Jan 17 2024 Nicolas Frayer - 2.06-116 - grub-core/commands: add flag to only search root dev - Resolves: #2223437