From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Fri, 21 Oct 2022 23:04:03 +0000 (+0200)
Subject: externalsrc.bbclass: Remove a trailing slash from ${B}
X-Git-Tag: 2020-04.21-dunfell~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa89e048e223ae2e96d0f55979f93f29904b5229;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

externalsrc.bbclass: Remove a trailing slash from ${B}

The trailing slash in ${B} caused -fdebug-prefix-map=${B}=... to not
match as intended, resulting in ${TMPDIR} ending up in files in
${PN}-dbg when externalsrc was in use, which in turn triggered buildpath
QA warnings.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 9b5031ed5a0d102905fa75acc418246c23df6eef)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index fc20eedf4d5..3f7f533cc6d 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -60,7 +60,7 @@ python () {
         if externalsrcbuild:
             d.setVar('B', externalsrcbuild)
         else:
-            d.setVar('B', '${WORKDIR}/${BPN}-${PV}/')
+            d.setVar('B', '${WORKDIR}/${BPN}-${PV}')
 
         local_srcuri = []
         fetch = bb.fetch2.Fetch((d.getVar('SRC_URI') or '').split(), d)