diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-06-25 23:22:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-27 16:23:40 +0100 |
commit | f3c0c3a35c8fa281fd0bee39f6a5bcfc179485e4 (patch) | |
tree | ee56d5ce432ff3fe1e037d4c0b81e4b797e3a125 | |
parent | 4bd6fb3488909357ba04cb52a41d3d61086efed3 (diff) | |
download | poky-f3c0c3a35c8fa281fd0bee39f6a5bcfc179485e4.tar.gz |
ovmf: update 202302 -> 202305
(From OE-Core rev: 175927cedffbd9fe5815219984d8b3c4be56ad98)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch | 8 | ||||
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | 48 | ||||
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch (renamed from meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch) | 22 | ||||
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0004-reproducible.patch (renamed from meta/recipes-core/ovmf/ovmf/0006-reproducible.patch) | 42 | ||||
-rw-r--r-- | meta/recipes-core/ovmf/ovmf_git.bb | 8 |
5 files changed, 63 insertions, 65 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch index 0c3df4fc44..490d9e8046 100644 --- a/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch +++ b/meta/recipes-core/ovmf/ovmf/0001-ovmf-update-path-to-native-BaseTools.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1125f5a02c2f327aeffe2d6b66a9d816ad2eeec0 Mon Sep 17 00:00:00 2001 | 1 | From d8df6b6433351763e1db791dd84d432983d2b249 Mon Sep 17 00:00:00 2001 |
2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | 2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> |
3 | Date: Thu, 9 Jun 2016 02:23:01 -0700 | 3 | Date: Thu, 9 Jun 2016 02:23:01 -0700 |
4 | Subject: [PATCH 1/6] ovmf: update path to native BaseTools | 4 | Subject: [PATCH 1/4] ovmf: update path to native BaseTools |
5 | 5 | ||
6 | BaseTools is a set of utilities to build EDK-based firmware. These utilities | 6 | BaseTools is a set of utilities to build EDK-based firmware. These utilities |
7 | are used during the build process. Thus, they need to be built natively. | 7 | are used during the build process. Thus, they need to be built natively. |
@@ -16,7 +16,7 @@ Upstream-Status: Inappropriate [oe-core cross compile specific] | |||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
17 | 17 | ||
18 | diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh | 18 | diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh |
19 | index 91b1442ade..1858dae31a 100755 | 19 | index b0334fb76e..094f86f096 100755 |
20 | --- a/OvmfPkg/build.sh | 20 | --- a/OvmfPkg/build.sh |
21 | +++ b/OvmfPkg/build.sh | 21 | +++ b/OvmfPkg/build.sh |
22 | @@ -24,7 +24,7 @@ then | 22 | @@ -24,7 +24,7 @@ then |
@@ -29,5 +29,5 @@ index 91b1442ade..1858dae31a 100755 | |||
29 | source edksetup.sh BaseTools | 29 | source edksetup.sh BaseTools |
30 | else | 30 | else |
31 | -- | 31 | -- |
32 | 2.32.0 | 32 | 2.30.2 |
33 | 33 | ||
diff --git a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch index 2293d7e938..efabc8febc 100644 --- a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 19d4c7f9812062a683b3ba60b35aac0461190456 Mon Sep 17 00:00:00 2001 | 1 | From 7675a67b8bb207de38ff5a9dc416e8b1028eb8ce Mon Sep 17 00:00:00 2001 |
2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | 2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> |
3 | Date: Fri, 26 Jul 2019 17:34:26 -0400 | 3 | Date: Fri, 26 Jul 2019 17:34:26 -0400 |
4 | Subject: [PATCH 2/6] BaseTools: makefile: adjust to build in under bitbake | 4 | Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake |
5 | 5 | ||
6 | Prepend the build flags with those of bitbake. This is to build | 6 | Prepend the build flags with those of bitbake. This is to build |
7 | using the bitbake native sysroot include and library directories. | 7 | using the bitbake native sysroot include and library directories. |
@@ -14,58 +14,56 @@ to fight against how upstream wants to configure the build. | |||
14 | Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> | 14 | Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> |
15 | Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] | 15 | Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] |
16 | --- | 16 | --- |
17 | BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++-------- | 17 | BaseTools/Source/C/Makefiles/header.makefile | 15 +++++++-------- |
18 | 1 file changed, 9 insertions(+), 8 deletions(-) | 18 | 1 file changed, 7 insertions(+), 8 deletions(-) |
19 | 19 | ||
20 | diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile | 20 | diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile |
21 | index 0df728f327..1299d47c87 100644 | 21 | index 1bf003523b..28757aed63 100644 |
22 | --- a/BaseTools/Source/C/Makefiles/header.makefile | 22 | --- a/BaseTools/Source/C/Makefiles/header.makefile |
23 | +++ b/BaseTools/Source/C/Makefiles/header.makefile | 23 | +++ b/BaseTools/Source/C/Makefiles/header.makefile |
24 | @@ -75,35 +75,36 @@ $(error Bad HOST_ARCH) | 24 | @@ -82,35 +82,34 @@ $(error Bad HOST_ARCH) |
25 | endif | 25 | endif |
26 | 26 | ||
27 | INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) | 27 | INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) |
28 | -BUILD_CPPFLAGS = $(INCLUDE) | 28 | -CPPFLAGS = $(INCLUDE) |
29 | +BUILD_CPPFLAGS += $(INCLUDE) | 29 | +CPPFLAGS += $(INCLUDE) |
30 | 30 | ||
31 | # keep EXTRA_OPTFLAGS last | 31 | # keep EXTRA_OPTFLAGS last |
32 | BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) | 32 | BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) |
33 | 33 | ||
34 | ifeq ($(DARWIN),Darwin) | 34 | ifeq ($(DARWIN),Darwin) |
35 | # assume clang or clang compatible flags on OS X | 35 | # assume clang or clang compatible flags on OS X |
36 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ | 36 | -CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ |
37 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ | 37 | +CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ |
38 | -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g | 38 | -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g |
39 | else | 39 | else |
40 | ifeq ($(CXX), llvm) | 40 | ifneq ($(CLANG),) |
41 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | 41 | -CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ |
42 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | 42 | +CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ |
43 | -fno-delete-null-pointer-checks -Wall -Werror \ | 43 | -fno-delete-null-pointer-checks -Wall -Werror \ |
44 | -Wno-deprecated-declarations -Wno-self-assign \ | 44 | -Wno-deprecated-declarations -Wno-self-assign \ |
45 | -Wno-unused-result -nostdlib -g | 45 | -Wno-unused-result -nostdlib -g |
46 | else | 46 | else |
47 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | 47 | -CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ |
48 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | 48 | +CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ |
49 | -fno-delete-null-pointer-checks -Wall -Werror \ | 49 | -fno-delete-null-pointer-checks -Wall -Werror \ |
50 | -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ | 50 | -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ |
51 | -Wno-unused-result -nostdlib -g | 51 | -Wno-unused-result -nostdlib -g |
52 | endif | 52 | endif |
53 | endif | 53 | endif |
54 | ifeq ($(CXX), llvm) | 54 | ifneq ($(CLANG),) |
55 | -BUILD_LFLAGS = | 55 | -LDFLAGS = |
56 | -BUILD_CXXFLAGS = -Wno-deprecated-register -Wno-unused-result | 56 | -CXXFLAGS = -Wno-deprecated-register -Wno-unused-result -std=c++14 |
57 | +BUILD_LFLAGS = $(LDFLAGS) | 57 | +CXXFLAGS += -Wno-deprecated-register -Wno-unused-result -std=c++14 |
58 | +BUILD_CXXFLAGS += -Wno-deprecated-register -Wno-unused-result | ||
59 | else | 58 | else |
60 | -BUILD_LFLAGS = | 59 | -LDFLAGS = |
61 | -BUILD_CXXFLAGS = -Wno-unused-result | 60 | -CXXFLAGS = -Wno-unused-result |
62 | +BUILD_LFLAGS = $(LDFLAGS) | 61 | +CXXFLAGS += -Wno-unused-result |
63 | +BUILD_CXXFLAGS += -Wno-unused-result | ||
64 | endif | 62 | endif |
65 | + | 63 | + |
66 | ifeq ($(HOST_ARCH), IA32) | 64 | ifeq ($(HOST_ARCH), IA32) |
67 | # | 65 | # |
68 | # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults | 66 | # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults |
69 | -- | 67 | -- |
70 | 2.32.0 | 68 | 2.30.2 |
71 | 69 | ||
diff --git a/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch index 7adc45465c..c0c763c1cf 100644 --- a/meta/recipes-core/ovmf/ovmf/0005-debug-prefix-map.patch +++ b/meta/recipes-core/ovmf/ovmf/0003-debug-prefix-map.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From cf6361f27cd6318622fd58ab6c0a9407cc633b1e Mon Sep 17 00:00:00 2001 | 1 | From 03e536b20d0b72cf078052f6748de8df3836625c Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 14 Jun 2021 19:56:28 +0200 | 3 | Date: Mon, 14 Jun 2021 19:56:28 +0200 |
4 | Subject: [PATCH] debug prefix map | 4 | Subject: [PATCH 3/4] debug prefix map |
5 | 5 | ||
6 | We want to pass ${DEBUG_PREFIX_MAP} to gcc commands and also pass in | 6 | We want to pass ${DEBUG_PREFIX_MAP} to gcc commands and also pass in |
7 | --debug-prefix-map to nasm (we carry a patch to nasm for this). The | 7 | --debug-prefix-map to nasm (we carry a patch to nasm for this). The |
@@ -22,10 +22,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
22 | 1 file changed, 9 insertions(+), 9 deletions(-) | 22 | 1 file changed, 9 insertions(+), 9 deletions(-) |
23 | 23 | ||
24 | diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template | 24 | diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template |
25 | index 471eb67c0c..a16fb5c9f1 100755 | 25 | index 503a6687c1..10ac38ef9e 100755 |
26 | --- a/BaseTools/Conf/tools_def.template | 26 | --- a/BaseTools/Conf/tools_def.template |
27 | +++ b/BaseTools/Conf/tools_def.template | 27 | +++ b/BaseTools/Conf/tools_def.template |
28 | @@ -1849,7 +1849,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_N | 28 | @@ -739,7 +739,7 @@ NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink="$(DEBUG_DIR)/$(MODULE_ |
29 | *_*_*_DTCPP_PATH = DEF(DTCPP_BIN) | 29 | *_*_*_DTCPP_PATH = DEF(DTCPP_BIN) |
30 | *_*_*_DTC_PATH = DEF(DTC_BIN) | 30 | *_*_*_DTC_PATH = DEF(DTC_BIN) |
31 | 31 | ||
@@ -34,7 +34,7 @@ index 471eb67c0c..a16fb5c9f1 100755 | |||
34 | DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie | 34 | DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -fno-pic -fno-pie |
35 | DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -fno-plt -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections | 35 | DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asynchronous-unwind-tables -fno-plt -Wno-address -fno-short-enums -fsigned-char -ffunction-sections -fdata-sections |
36 | DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access | 36 | DEFINE GCC_ARM_CC_XIPFLAGS = -mno-unaligned-access |
37 | @@ -1869,8 +1869,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere | 37 | @@ -759,8 +759,8 @@ DEFINE GCC_ARM_ASLDLINK_FLAGS = DEF(GCC_ARM_DLINK_FLAGS) -Wl,--entry,Refere |
38 | DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) | 38 | DEFINE GCC_AARCH64_ASLDLINK_FLAGS = DEF(GCC_AARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) |
39 | DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) | 39 | DEFINE GCC_LOONGARCH64_ASLDLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_FLAGS) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) |
40 | DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map | 40 | DEFINE GCC_IA32_X64_DLINK_FLAGS = DEF(GCC_IA32_X64_DLINK_COMMON) --entry _$(IMAGE_ENTRY_POINT) --file-alignment 0x20 --section-alignment 0x20 -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map |
@@ -45,7 +45,7 @@ index 471eb67c0c..a16fb5c9f1 100755 | |||
45 | DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h | 45 | DEFINE GCC_VFRPP_FLAGS = -x c -E -P -DVFRCOMPILE --include $(MODULE_NAME)StrDefs.h |
46 | DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h | 46 | DEFINE GCC_ASLPP_FLAGS = -x c -E -include AutoGen.h |
47 | DEFINE GCC_ASLCC_FLAGS = -x c | 47 | DEFINE GCC_ASLCC_FLAGS = -x c |
48 | @@ -2022,7 +2022,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF( | 48 | @@ -913,7 +913,7 @@ DEFINE GCC5_LOONGARCH64_PP_FLAGS = -mabi=lp64d -march=loongarch64 DEF( |
49 | *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS) | 49 | *_GCC48_IA32_DLINK2_FLAGS = DEF(GCC48_IA32_DLINK2_FLAGS) |
50 | *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) | 50 | *_GCC48_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) |
51 | *_GCC48_IA32_OBJCOPY_FLAGS = | 51 | *_GCC48_IA32_OBJCOPY_FLAGS = |
@@ -54,7 +54,7 @@ index 471eb67c0c..a16fb5c9f1 100755 | |||
54 | 54 | ||
55 | DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) | 55 | DEBUG_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) |
56 | RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable | 56 | RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set-variable |
57 | @@ -2050,7 +2050,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set | 57 | @@ -941,7 +941,7 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Wno-unused-but-set |
58 | *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS) | 58 | *_GCC48_X64_DLINK2_FLAGS = DEF(GCC48_X64_DLINK2_FLAGS) |
59 | *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) | 59 | *_GCC48_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) |
60 | *_GCC48_X64_OBJCOPY_FLAGS = | 60 | *_GCC48_X64_OBJCOPY_FLAGS = |
@@ -63,7 +63,7 @@ index 471eb67c0c..a16fb5c9f1 100755 | |||
63 | 63 | ||
64 | DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) | 64 | DEBUG_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) |
65 | RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable | 65 | RELEASE_GCC48_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) -Wno-unused-but-set-variable |
66 | @@ -2159,7 +2159,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s | 66 | @@ -1050,7 +1050,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s |
67 | *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS) | 67 | *_GCC49_IA32_DLINK2_FLAGS = DEF(GCC49_IA32_DLINK2_FLAGS) |
68 | *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) | 68 | *_GCC49_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) |
69 | *_GCC49_IA32_OBJCOPY_FLAGS = | 69 | *_GCC49_IA32_OBJCOPY_FLAGS = |
@@ -72,7 +72,7 @@ index 471eb67c0c..a16fb5c9f1 100755 | |||
72 | 72 | ||
73 | DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) | 73 | DEBUG_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) |
74 | RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable | 74 | RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable |
75 | @@ -2187,7 +2187,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set | 75 | @@ -1078,7 +1078,7 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Wno-unused-but-set |
76 | *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS) | 76 | *_GCC49_X64_DLINK2_FLAGS = DEF(GCC49_X64_DLINK2_FLAGS) |
77 | *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) | 77 | *_GCC49_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) |
78 | *_GCC49_X64_OBJCOPY_FLAGS = | 78 | *_GCC49_X64_OBJCOPY_FLAGS = |
@@ -81,7 +81,7 @@ index 471eb67c0c..a16fb5c9f1 100755 | |||
81 | 81 | ||
82 | DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) | 82 | DEBUG_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) |
83 | RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable | 83 | RELEASE_GCC49_X64_CC_FLAGS = DEF(GCC49_X64_CC_FLAGS) -Wno-unused-but-set-variable -Wno-unused-const-variable |
84 | @@ -2302,7 +2302,7 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 | 84 | @@ -1337,7 +1337,7 @@ RELEASE_GCCNOLTO_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 |
85 | *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie | 85 | *_GCC5_IA32_DLINK2_FLAGS = DEF(GCC5_IA32_DLINK2_FLAGS) -no-pie |
86 | *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) | 86 | *_GCC5_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS) |
87 | *_GCC5_IA32_OBJCOPY_FLAGS = | 87 | *_GCC5_IA32_OBJCOPY_FLAGS = |
@@ -90,7 +90,7 @@ index 471eb67c0c..a16fb5c9f1 100755 | |||
90 | 90 | ||
91 | DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto | 91 | DEBUG_GCC5_IA32_CC_FLAGS = DEF(GCC5_IA32_CC_FLAGS) -flto |
92 | DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386 | 92 | DEBUG_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl,-m,elf_i386,--oformat=elf32-i386 |
93 | @@ -2334,7 +2334,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, | 93 | @@ -1369,7 +1369,7 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, |
94 | *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS) | 94 | *_GCC5_X64_DLINK2_FLAGS = DEF(GCC5_X64_DLINK2_FLAGS) |
95 | *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) | 95 | *_GCC5_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS) |
96 | *_GCC5_X64_OBJCOPY_FLAGS = | 96 | *_GCC5_X64_OBJCOPY_FLAGS = |
diff --git a/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch index 846f408012..c3fdc3d863 100644 --- a/meta/recipes-core/ovmf/ovmf/0006-reproducible.patch +++ b/meta/recipes-core/ovmf/ovmf/0004-reproducible.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 27ed9962f5cb3afcc44d6c96c53277132a999712 Mon Sep 17 00:00:00 2001 | 1 | From c59850367a190d70dec43e0a66f399a4d8a5ffed Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 14 Jun 2021 19:57:30 +0200 | 3 | Date: Mon, 14 Jun 2021 19:57:30 +0200 |
4 | Subject: [PATCH 6/6] reproducible | 4 | Subject: [PATCH 4/4] reproducible |
5 | 5 | ||
6 | This patch fixes various things which make the build more reproducible. Some changes | 6 | This patch fixes various things which make the build more reproducible. Some changes |
7 | here only change intermediate artefacts but that means when you have two build trees | 7 | here only change intermediate artefacts but that means when you have two build trees |
@@ -35,10 +35,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
35 | 4 files changed, 24 insertions(+), 16 deletions(-) | 35 | 4 files changed, 24 insertions(+), 16 deletions(-) |
36 | 36 | ||
37 | diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c | 37 | diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c |
38 | index d097db8632..a87ae6f3d0 100644 | 38 | index 9c17c90b16..fcc7864141 100644 |
39 | --- a/BaseTools/Source/C/GenFw/Elf64Convert.c | 39 | --- a/BaseTools/Source/C/GenFw/Elf64Convert.c |
40 | +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c | 40 | +++ b/BaseTools/Source/C/GenFw/Elf64Convert.c |
41 | @@ -14,6 +14,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent | 41 | @@ -15,6 +15,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent |
42 | #ifndef __GNUC__ | 42 | #ifndef __GNUC__ |
43 | #include <windows.h> | 43 | #include <windows.h> |
44 | #include <io.h> | 44 | #include <io.h> |
@@ -47,35 +47,35 @@ index d097db8632..a87ae6f3d0 100644 | |||
47 | #endif | 47 | #endif |
48 | #include <assert.h> | 48 | #include <assert.h> |
49 | #include <stdio.h> | 49 | #include <stdio.h> |
50 | @@ -769,7 +771,7 @@ ScanSections64 ( | 50 | @@ -990,7 +992,7 @@ ScanSections64 ( |
51 | } | 51 | } |
52 | mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) + | 52 | mCoffOffset = mDebugOffset + sizeof(EFI_IMAGE_DEBUG_DIRECTORY_ENTRY) + |
53 | sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + | 53 | sizeof(EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY) + |
54 | - strlen(mInImageName) + 1; | 54 | - strlen(mInImageName) + 1; |
55 | + strlen(basename(mInImageName)) + 1; | 55 | + strlen(basename(mInImageName)) + 1; |
56 | 56 | ||
57 | mCoffOffset = CoffAlign(mCoffOffset); | 57 | // |
58 | if (SectionCount == 0) { | 58 | // Add more space in the .debug data region for the DllCharacteristicsEx |
59 | @@ -1608,7 +1610,7 @@ WriteDebug64 ( | 59 | @@ -2261,7 +2263,7 @@ WriteDebug64 ( |
60 | EFI_IMAGE_DEBUG_DIRECTORY_ENTRY *Dir; | 60 | EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10; |
61 | EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY *Nb10; | 61 | EFI_IMAGE_DEBUG_EX_DLLCHARACTERISTICS_ENTRY *DllEntry; |
62 | 62 | ||
63 | - Len = strlen(mInImageName) + 1; | 63 | - Len = strlen(mInImageName) + 1; |
64 | + Len = strlen(basename(mInImageName)) + 1; | 64 | + Len = strlen(basename(mInImageName)) + 1; |
65 | 65 | ||
66 | Dir = (EFI_IMAGE_DEBUG_DIRECTORY_ENTRY*)(mCoffFile + mDebugOffset); | 66 | NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset); |
67 | Dir->Type = EFI_IMAGE_DEBUG_TYPE_CODEVIEW; | 67 | DataDir = &NtHdr->Pe32Plus.OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_DEBUG]; |
68 | @@ -1618,7 +1620,7 @@ WriteDebug64 ( | 68 | @@ -2294,7 +2296,7 @@ WriteDebug64 ( |
69 | 69 | ||
70 | Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1); | 70 | Nb10 = (EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY*)(Dir + 1); |
71 | Nb10->Signature = CODEVIEW_SIGNATURE_NB10; | 71 | Nb10->Signature = CODEVIEW_SIGNATURE_NB10; |
72 | - strcpy ((char *)(Nb10 + 1), mInImageName); | 72 | - strcpy ((char *)(Nb10 + 1), mInImageName); |
73 | + strcpy ((char *)(Nb10 + 1), basename(mInImageName)); | 73 | + strcpy ((char *)(Nb10 + 1), basename(mInImageName)); |
74 | } | ||
74 | 75 | ||
75 | 76 | STATIC | |
76 | NtHdr = (EFI_IMAGE_OPTIONAL_HEADER_UNION *)(mCoffFile + mNtHdrOffset); | ||
77 | diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py | 77 | diff --git a/BaseTools/Source/Python/AutoGen/BuildEngine.py b/BaseTools/Source/Python/AutoGen/BuildEngine.py |
78 | index 722fead75a..8f1c236970 100644 | 78 | index 752a1a1f6a..02054cccf8 100644 |
79 | --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py | 79 | --- a/BaseTools/Source/Python/AutoGen/BuildEngine.py |
80 | +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py | 80 | +++ b/BaseTools/Source/Python/AutoGen/BuildEngine.py |
81 | @@ -70,6 +70,9 @@ class TargetDescBlock(object): | 81 | @@ -70,6 +70,9 @@ class TargetDescBlock(object): |
@@ -89,7 +89,7 @@ index 722fead75a..8f1c236970 100644 | |||
89 | if Input not in self.Inputs: | 89 | if Input not in self.Inputs: |
90 | self.Inputs.append(Input) | 90 | self.Inputs.append(Input) |
91 | diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py | 91 | diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py |
92 | index 961b2ab1c3..23c1592025 100755 | 92 | index daec9c6d54..0e8cc20efe 100755 |
93 | --- a/BaseTools/Source/Python/AutoGen/GenMake.py | 93 | --- a/BaseTools/Source/Python/AutoGen/GenMake.py |
94 | +++ b/BaseTools/Source/Python/AutoGen/GenMake.py | 94 | +++ b/BaseTools/Source/Python/AutoGen/GenMake.py |
95 | @@ -575,7 +575,7 @@ cleanlib: | 95 | @@ -575,7 +575,7 @@ cleanlib: |
@@ -153,10 +153,10 @@ index 961b2ab1c3..23c1592025 100755 | |||
153 | if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros: | 153 | if T.GenFileListMacro and T.FileListMacro not in self.FileListMacros: |
154 | self.FileListMacros[T.FileListMacro] = [] | 154 | self.FileListMacros[T.FileListMacro] = [] |
155 | diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 155 | diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py |
156 | index d70b0d7ae8..25dca9a6df 100755 | 156 | index d05410b329..99b3f64aba 100755 |
157 | --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 157 | --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py |
158 | +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 158 | +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py |
159 | @@ -1484,6 +1484,9 @@ class ModuleAutoGen(AutoGen): | 159 | @@ -1474,6 +1474,9 @@ class ModuleAutoGen(AutoGen): |
160 | for File in Files: | 160 | for File in Files: |
161 | if File.lower().endswith('.pdb'): | 161 | if File.lower().endswith('.pdb'): |
162 | AsBuiltInfDict['binary_item'].append('DISPOSABLE|' + File) | 162 | AsBuiltInfDict['binary_item'].append('DISPOSABLE|' + File) |
@@ -166,7 +166,7 @@ index d70b0d7ae8..25dca9a6df 100755 | |||
166 | HeaderComments = self.Module.HeaderComments | 166 | HeaderComments = self.Module.HeaderComments |
167 | StartPos = 0 | 167 | StartPos = 0 |
168 | for Index in range(len(HeaderComments)): | 168 | for Index in range(len(HeaderComments)): |
169 | @@ -1759,7 +1762,7 @@ class ModuleAutoGen(AutoGen): | 169 | @@ -1749,7 +1752,7 @@ class ModuleAutoGen(AutoGen): |
170 | if os.path.exists (self.TimeStampPath): | 170 | if os.path.exists (self.TimeStampPath): |
171 | os.remove (self.TimeStampPath) | 171 | os.remove (self.TimeStampPath) |
172 | 172 | ||
@@ -176,5 +176,5 @@ index d70b0d7ae8..25dca9a6df 100755 | |||
176 | # Ignore generating makefile when it is a binary module | 176 | # Ignore generating makefile when it is a binary module |
177 | if self.IsBinaryModule: | 177 | if self.IsBinaryModule: |
178 | -- | 178 | -- |
179 | 2.32.0 | 179 | 2.30.2 |
180 | 180 | ||
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index bd92c5d43d..761c265453 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb | |||
@@ -22,12 +22,12 @@ BUILD_CFLAGS += "-Wno-error=stringop-overflow" | |||
22 | SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ | 22 | SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ |
23 | file://0001-ovmf-update-path-to-native-BaseTools.patch \ | 23 | file://0001-ovmf-update-path-to-native-BaseTools.patch \ |
24 | file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ | 24 | file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ |
25 | file://0005-debug-prefix-map.patch \ | 25 | file://0003-debug-prefix-map.patch \ |
26 | file://0006-reproducible.patch \ | 26 | file://0004-reproducible.patch \ |
27 | " | 27 | " |
28 | 28 | ||
29 | PV = "edk2-stable202302" | 29 | PV = "edk2-stable202305" |
30 | SRCREV = "f80f052277c88a67c55e107b550f504eeea947d3" | 30 | SRCREV = "ba91d0292e593df8528b66f99c1b0b14fadc8e16" |
31 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" | 31 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)" |
32 | 32 | ||
33 | inherit deploy | 33 | inherit deploy |