diff options
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/rootfs.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index c62fa5f54a..cd65e62030 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -126,17 +126,16 @@ class Rootfs(object, metaclass=ABCMeta): | |||
126 | bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir)) | 126 | bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir)) |
127 | shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True) | 127 | shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True) |
128 | 128 | ||
129 | cpath = oe.cachedpath.CachedPath() | ||
130 | # Copy files located in /usr/lib/debug or /usr/src/debug | 129 | # Copy files located in /usr/lib/debug or /usr/src/debug |
131 | for dir in ["/usr/lib/debug", "/usr/src/debug"]: | 130 | for dir in ["/usr/lib/debug", "/usr/src/debug"]: |
132 | src = self.image_rootfs + '-orig' + dir | 131 | src = self.image_rootfs + '-orig' + dir |
133 | if cpath.exists(src): | 132 | if os.path.exists(src): |
134 | dst = self.image_rootfs + dir | 133 | dst = self.image_rootfs + dir |
135 | bb.utils.mkdirhier(os.path.dirname(dst)) | 134 | bb.utils.mkdirhier(os.path.dirname(dst)) |
136 | shutil.copytree(src, dst) | 135 | shutil.copytree(src, dst) |
137 | 136 | ||
138 | # Copy files with suffix '.debug' or located in '.debug' dir. | 137 | # Copy files with suffix '.debug' or located in '.debug' dir. |
139 | for root, dirs, files in cpath.walk(self.image_rootfs + '-orig'): | 138 | for root, dirs, files in os.walk(self.image_rootfs + '-orig'): |
140 | relative_dir = root[len(self.image_rootfs + '-orig'):] | 139 | relative_dir = root[len(self.image_rootfs + '-orig'):] |
141 | for f in files: | 140 | for f in files: |
142 | if f.endswith('.debug') or '/.debug' in relative_dir: | 141 | if f.endswith('.debug') or '/.debug' in relative_dir: |