diff options
author | Saul Wold <saul.wold@windriver.com> | 2023-02-20 18:31:29 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-09 13:19:02 +0000 |
commit | d4d9aa02eaacfd22deb9ea2766776a76c9c76e62 (patch) | |
tree | c75f676ec47dc9f38925fd82c6808f8ba1d1018a | |
parent | 358d319cf5acf5d9bdb50b3370ab64c76a80a0bf (diff) | |
download | poky-d4d9aa02eaacfd22deb9ea2766776a76c9c76e62.tar.gz |
package.bbclase: Add check for /build in copydebugsources()
This is needed when the SDK or eSDK is installed in a /build top level
directory as it conflicts with the build directory within the existing
/usr/src/debug/build (which is really a link). Rename it and then do the
copy, this is not an issue with master currently due to some other
changes that occurred in master.
Fixes: [YOCTO #15026]
(From OE-Core rev: 80839835ec9fcb63069289225a3c1af257ffdef7)
Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/package.bbclass | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 8b11fdd155..2950218145 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -636,6 +636,13 @@ def copydebugsources(debugsrcdir, sources, d): | |||
636 | # Same check as above for externalsrc | 636 | # Same check as above for externalsrc |
637 | if workdir not in sdir: | 637 | if workdir not in sdir: |
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 | ||
640 | # /usr/src/debug/build so rename sdir to build.build | ||
641 | if sdir.find("/build") == 0: | ||
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) | ||
644 | sdir = sdir.replace("/build", "/build.build", 1) | ||
645 | |||
639 | cmd = "mv %s%s%s/* %s%s" % (dvar, debugsrcdir, sdir, dvar,debugsrcdir) | 646 | cmd = "mv %s%s%s/* %s%s" % (dvar, debugsrcdir, sdir, dvar,debugsrcdir) |
640 | subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) | 647 | subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) |
641 | 648 | ||