diff options
author | Anders Darander <anders@chargestorm.se> | 2016-05-20 11:01:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-20 10:20:56 +0100 |
commit | e73a85be3e020561db92a197c593afe7fd952919 (patch) | |
tree | af8aaff68a0e0d9657c602ef8a892fa31124e96f /meta/lib | |
parent | bf4616d43b29ad3640c9152fb1d2b56311ebef1b (diff) | |
download | poky-e73a85be3e020561db92a197c593afe7fd952919.tar.gz |
lib/oe/rootfs: Fix DEBUGFS generation, without openssl
In commit 20ea6d274bb0a9a5addb111f32793de49b907865, debugfs generation
for images using opkg, which included openssl was fixed.
However, that broke the generation of the opkg-based images, that lacks
openssl. The error is a python stack trace, showing that shutil.copytree
tries to copy a non-existing directory.
This relates to [YOCTO #9040].
(From OE-Core rev: f6b0b260ce18a30d04edfb0afb7942b9f9a5480b)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index f5c465fbd2..7087b12f25 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -116,6 +116,8 @@ class Rootfs(object): | |||
116 | 116 | ||
117 | bb.note(" Copying back package database...") | 117 | bb.note(" Copying back package database...") |
118 | for dir in dirs: | 118 | for dir in dirs: |
119 | if not os.path.isdir(self.image_rootfs + '-orig' + dir): | ||
120 | continue | ||
119 | bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir)) | 121 | bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir)) |
120 | shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True) | 122 | shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True) |
121 | 123 | ||