See here: https://github.com/tianocore/edk2/pull/1513/files
The change was thus applied twice to the same file. Signed-off-by: Alexander Kanavin <a...@linutronix.de> --- .../ovmf/ovmf/0004-Strip-build-paths.patch | 32 ------------------- meta/recipes-core/ovmf/ovmf_git.bb | 1 - 2 files changed, 33 deletions(-) delete mode 100644 meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch diff --git a/meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch b/meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch deleted file mode 100644 index dfb8a73398..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b7cfe97895e0586d14403ba98e62a0cd9373da96 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kana...@gmail.com> -Date: Mon, 14 Jun 2021 19:55:08 +0200 -Subject: [PATCH 4/6] Strip build paths - -Pass --zero to GenFw in release builds so that the sections that link back to -the intermediate binaries (containing build paths) are removed. - -Upstream-Status: Pending (discussion at https://bugzilla.tianocore.org/show_bug.cgi?id=3256) -Signed-off-by: Ross Burton <ross.bur...@arm.com> - -Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> ---- - OvmfPkg/OvmfPkgIa32.dsc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 33fbd76790..06c6d5ce60 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -91,6 +91,8 @@ - - !include NetworkPkg/NetworkBuildOptions.dsc.inc - -+ RELEASE_*_*_GENFW_FLAGS = --zero -+ - [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] - GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 - XCODE:*_*_*_DLINK_FLAGS = -seg1addr 0x1000 -segalign 0x1000 --- -2.32.0 - diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index ce3b650ddf..80b9c1447f 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -19,7 +19,6 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \ file://0001-ovmf-update-path-to-native-BaseTools.patch \ file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://0003-ovmf-Update-to-latest.patch \ - file://0004-Strip-build-paths.patch \ file://0005-debug-prefix-map.patch \ file://0006-reproducible.patch \ file://0001-Fix-VLA-parameter-warning.patch \ -- 2.20.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158852): https://lists.openembedded.org/g/openembedded-core/message/158852 Mute This Topic: https://lists.openembedded.org/mt/87335191/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
