summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2021-11-19 16:54:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-29 23:07:13 (GMT)
commitfc5c6e373a49e354bcf2bd4bf57a39c8d9894583 (patch)
tree3d01469e4a06614459f3b7f99ac31c99898ccf75 /meta
parentc93239706f70b0cea59797814a409cfc376b3e0f (diff)
downloadpoky-master.tar.gz
ovmf: remove patch merged upstreamHEADmaster
See here: https://github.com/tianocore/edk2/pull/1513/files The change was thus applied twice to the same file. (From OE-Core rev: af90f9681bae3defe841ddcf80755960792faa88) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch32
-rw-r--r--meta/recipes-core/ovmf/ovmf_git.bb1
2 files changed, 0 insertions, 33 deletions
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 dfb8a73..0000000
--- a/meta/recipes-core/ovmf/ovmf/0004-Strip-build-paths.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From b7cfe97895e0586d14403ba98e62a0cd9373da96 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 14 Jun 2021 19:55:08 +0200
4Subject: [PATCH 4/6] Strip build paths
5
6Pass --zero to GenFw in release builds so that the sections that link back to
7the intermediate binaries (containing build paths) are removed.
8
9Upstream-Status: Pending (discussion at https://bugzilla.tianocore.org/show_bug.cgi?id=3256)
10Signed-off-by: Ross Burton <ross.burton@arm.com>
11
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 OvmfPkg/OvmfPkgIa32.dsc | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
18index 33fbd76790..06c6d5ce60 100644
19--- a/OvmfPkg/OvmfPkgIa32.dsc
20+++ b/OvmfPkg/OvmfPkgIa32.dsc
21@@ -91,6 +91,8 @@
22
23 !include NetworkPkg/NetworkBuildOptions.dsc.inc
24
25+ RELEASE_*_*_GENFW_FLAGS = --zero
26+
27 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]
28 GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
29 XCODE:*_*_*_DLINK_FLAGS = -seg1addr 0x1000 -segalign 0x1000
30--
312.32.0
32
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
index ce3b650..80b9c14 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 \
19 file://0001-ovmf-update-path-to-native-BaseTools.patch \ 19 file://0001-ovmf-update-path-to-native-BaseTools.patch \
20 file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ 20 file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
21 file://0003-ovmf-Update-to-latest.patch \ 21 file://0003-ovmf-Update-to-latest.patch \
22 file://0004-Strip-build-paths.patch \
23 file://0005-debug-prefix-map.patch \ 22 file://0005-debug-prefix-map.patch \
24 file://0006-reproducible.patch \ 23 file://0006-reproducible.patch \
25 file://0001-Fix-VLA-parameter-warning.patch \ 24 file://0001-Fix-VLA-parameter-warning.patch \