From: Martin Jansa <martin.jansa@gmail.com>
Date: Thu, 16 Nov 2023 22:48:26 +0000 (+0100)
Subject: ovmf: drop PE, PR from /usr/src/debug paths
X-Git-Tag: yocto-5.2~4563
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d12ee54263e3a2ed8b1a84b72a2a1423fe09c3cf;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

ovmf: drop PE, PR from /usr/src/debug paths

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb
index 6bbe21ac5c6..3dc031d3b67 100644
--- a/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/meta/recipes-core/ovmf/ovmf_git.bb
@@ -122,7 +122,7 @@ fix_toolchain:append:class-native() {
 # --debug-prefix-map to nasm (we carry a patch to nasm for this). The
 # tools definitions are built by ovmf-native so we need to pass this in
 # at target build time when we know the right values.
-export NASM_PREFIX_MAP = "--debug-prefix-map=${WORKDIR}=/usr/src/debug/ovmf/${EXTENDPE}${PV}-${PR}"
+export NASM_PREFIX_MAP = "--debug-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR}"
 export GCC_PREFIX_MAP = "${DEBUG_PREFIX_MAP} -Wno-stringop-overflow -Wno-maybe-uninitialized"
 
 GCC_VER="$(${CC} -v 2>&1 | tail -n1 | awk '{print $3}')"