summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2023-04-14 17:32:13 +0200
committerSteve Sakoman <steve@sakoman.com>2023-04-19 04:45:00 -1000
commitfa856e0dac16e13991561882bc6ad4c830674d78 (patch)
treed981e08e67f9b2c639efd8152308e52cf3c6419b /meta
parent29f64c072cccf826b2f4d5120206d536e1420a4c (diff)
downloadpoky-fa856e0dac16e13991561882bc6ad4c830674d78.tar.gz
package.bbclass: correct check for /build in copydebugsources()
Newly introduced kirkstone-only commit https://git.openembedded.org/openembedded-core/commit/?h=kirkstone&id=80839835ec9fcb63069289225a3c1af257ffdef7 broke builds with externalsrc in Gitlab-CI. This is yocto-4.0.9 regression. It checks if directory starts with "build" instead of if checking if it equals to "build". Gitlab-CI uses directory "/builds" which matches the check but directory /build does not exist, only /builds. After successful check it tries to move this non-existent directory which does not exists and thus do_package fails. (From OE-Core rev: b67e714b367a08fdeeeff68c2d9495ec9bc07304) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 2950218145..67acc278d1 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -638,7 +638,7 @@ def copydebugsources(debugsrcdir, sources, d):
638 if os.path.exists(dvar + debugsrcdir + sdir): 638 if os.path.exists(dvar + debugsrcdir + sdir):
639 # Special case for /build since we need to move into 639 # Special case for /build since we need to move into
640 # /usr/src/debug/build so rename sdir to build.build 640 # /usr/src/debug/build so rename sdir to build.build
641 if sdir.find("/build") == 0: 641 if sdir == "/build" or sdir.find("/build/") == 0:
642 cmd = "mv %s%s%s %s%s%s" % (dvar, debugsrcdir, "/build", dvar, debugsrcdir, "/build.build") 642 cmd = "mv %s%s%s %s%s%s" % (dvar, debugsrcdir, "/build", dvar, debugsrcdir, "/build.build")
643 subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) 643 subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
644 sdir = sdir.replace("/build", "/build.build", 1) 644 sdir = sdir.replace("/build", "/build.build", 1)