ovmf: Don't define bool type if building in C23 mode
PATCH 1/1 ovmf: Don't define bool type if building in C23 mode
From: Mingli Yu <[email protected]>
Backport a patch [1] to fix the below build failure:
/buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:17: error: two or more data types in declaration specifiers 13 | typedef BOOLEAN bool;
| ^~~~
/buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:1: error: useless type name in empty declaration [-Werror] 13 | typedef BOOLEAN bool;
[1] https://github.com/tianocore/edk2/commit/772fa11ac82579a8f6fa171e6b835f68af3f64be
--- ...t-define-bool-type-if-building-in-C2.patch | 35 +++++++++++++++++++ meta/recipes-core/ovmf/ovmf_git.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-core/ovmf/ovmf/0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch
meta/recipes-core/ovmf/ovmf/0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 772fa11ac82579a8f6fa171e6b835f68af3f64be Mon Sep 17 00:00:00 2001 +From: Rebecca Cran <[email protected]> +Date: Mon, 26 May 2025 08:01:39 -0600 +Subject: [PATCH] SecurityPkg: Don't define bool type if building in C23 mode + +In C23 bool is a built-in type, so it's not necessary to typedef +bool in LibspdmStdBoolAlt.h. + +Signed-off-by: Rebecca Cran <[email protected]> + +Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/772fa11ac82579a8f6fa171e6b835f68af3f64be] + +Signed-off-by: Mingli Yu <[email protected]> +--- + .../DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h b/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h +index 08af7296d0..395ef22d43 100644 +--- a/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h ++++ b/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h +@@ -10,7 +10,10 @@ SPDX-License-Identifier: BSD-2-Clause-Patent + #ifndef LIBSPDM_STDBOOL_ALT_H + #define LIBSPDM_STDBOOL_ALT_H + ++// In C23, bool is a built-in type ++#if __STDC_VERSION__ < 202311L + typedef BOOLEAN bool; ++#endif + + #ifndef true + #define true TRUE +-- +2.34.1 +
meta/recipes-core/ovmf/ovmf_git.bb +1 -0
@@ -30,6 +30,7 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://CVE-2024-38797-2.patch \ file://CVE-2024-38797-3.patch \ file://CVE-2024-38797-4.patch \ + file://0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch \ " PV = "edk2-stable202502"
Signature · 1 line
2.34.1
Quoted 9 lines · Mingli via lists.openembedded.org Yu
From: Mingli Yu <[email protected]>
Backport a patch [1] to fix the below build failure:
/buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:17: error: two or more data types in declaration specifiers 13 | typedef BOOLEAN bool;
| ^~~~
/buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:1: error: useless type name in empty declaration [-Werror] 13 | typedef BOOLEAN bool;
Quoted 4 lines
[1] https://github.com/tianocore/edk2/commit/772fa11ac82579a8f6fa171e6b835f68af3f64be
Signed-off-by Mingli Yu <[email protected]>---
Hi,
Thanks for the patch, but it looks like the embedded patch does not apply cleanly:
ERROR: ovmf-native-edk2-stable202502-r0 do_patch: Applying patch '0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch' on target directory '/srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86_64-linux/ovmf-native/edk2-stable202502/sources/ovmf-edk2-stable202502' CmdError('quilt --quiltrc /srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86_64-linux/ovmf-native/edk2-stable202502/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch patching file SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h
Hunk #1 FAILED at 10 (different line endings).
1 out of 1 hunk FAILED -- rejects in file SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h
Patch 0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch does not apply (enforce with -f)
https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/1998
Can you have a look at this issue please?
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi,
Quoted 27 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 9 lines · Mingli via lists.openembedded.org Yu
From: Mingli Yu <[email protected]>
Backport a patch [1] to fix the below build failure:
/buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:17: error: two or more data types in declaration specifiers 13 | typedef BOOLEAN bool;
| ^~~~
/buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:1: error: useless type name in empty declaration [-Werror] 13 | typedef BOOLEAN bool;Quoted 4 lines
[1] https://github.com/tianocore/edk2/commit/772fa11ac82579a8f6fa171e6b835f68af3f64be
Signed-off-by Mingli Yu <[email protected]>---
Hi,
Thanks for the patch, but it looks like the embedded patch does not apply cleanly:
ERROR: ovmf-native-edk2-stable202502-r0
do_patch: Applying patch '0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch' on target directory '/srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86_64-linux/ovmf-native/edk2-stable202502/sources/ovmf-edk2-stable202502' CmdError('quilt --quiltrc/srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86_64-linux/ovmf-native/edk2-stable202502/recipe-sysroot-native/etc/quiltrcpush', 0, 'stdout: Applying patch 0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch patching fileSecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h
Hunk #1 FAILED at 10 (different line endings).
1 out of 1 hunk FAILED -- rejects in fileSecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h
Patch 0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch does not apply (enforce with -f)
Quoted 3 lines
https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/1998
Can you have a look at this issue please?
ovmf and edk2 are notorious for using Windows newlines so patches over mailing lists may break when applying. I suggest using git to pull the changes or manually applying simple changes.
Cheers,
-Mikko
Quoted 34 lines · Mikko Rapeli
Hi,
Quoted 27 lines · Mathieu Dubois-Briand via lists.openembedded.org
Quoted 9 lines · Mingli via lists.openembedded.org Yu
From: Mingli Yu <[email protected]>
Backport a patch [1] to fix the below build failure:
/buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:17: error: two or more data types in declaration specifiers 13 | typedef BOOLEAN bool;
| ^~~~
/buildarea/tmp/work/corei7-64-wrs-linux/ovmf/edk2-stable202502/sources/ovmf-edk2-stable202502/SecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h:13:1: error: useless type name in empty declaration [-Werror] 13 | typedef BOOLEAN bool;Quoted 4 lines
[1] https://github.com/tianocore/edk2/commit/772fa11ac82579a8f6fa171e6b835f68af3f64be
Signed-off-by Mingli Yu <[email protected]>---
Hi,
Thanks for the patch, but it looks like the embedded patch does not apply cleanly:
ERROR: ovmf-native-edk2-stable202502-r0
do_patch: Applying patch '0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch' on target directory '/srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86_64-linux/ovmf-native/edk2-stable202502/sources/ovmf-edk2-stable202502' CmdError('quilt --quiltrc/srv/pokybuild/yocto-worker/qemux86-world-alt/build/build/tmp/work/x86_64-linux/ovmf-native/edk2-stable202502/recipe-sysroot-native/etc/quiltrcpush', 0, 'stdout: Applying patch 0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch patching fileSecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h
Hunk #1 FAILED at 10 (different line endings).
1 out of 1 hunk FAILED -- rejects in fileSecurityPkg/DeviceSecurity/SpdmLib/Include/hal/LibspdmStdBoolAlt.h
Patch 0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch does not apply (enforce with -f)Quoted 3 lines
https://autobuilder.yoctoproject.org/valkyrie/#/builders/17/builds/1998
Can you have a look at this issue please?
Quoted 7 lines
ovmf and edk2 are notorious for using Windows newlines so patches over mailing lists may break when applying. I suggest using git to pull the changes or manually applying simple changes.
Cheers,
-Mikko
Makes sense. I believe I managed to fix the new line issues, so the patch is back in testing queue.
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
meta/recipes-core/ovmf/ovmf_git.bb SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ · line 36
Quoted 3 lines · Mingli via lists.openembedded.org
meta/recipes-core/ovmf/ovmf_git.bb +2
-0+Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/772fa11ac82579a8f6fa171e6b835f68af3f64be] + file://0001-SecurityPkg-Don-t-define-bool-type-if-building-in-C2.patch \ PV = "edk2-stable202502"
There's already a newer 202505 version (and 202508 will come out soon). Can you work on the version update please? Yocto master can take backports up to a point, but not for much longer.
Alex