aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2016-05-20 11:01:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-20 10:20:42 +0100
commitf6b0b260ce18a30d04edfb0afb7942b9f9a5480b (patch)
tree0c3da8d71458ec076960f7e96262fae96ac7586d
parentdee987b6f157b0bc245086d3af914d411ae6d1ab (diff)
downloadopenembedded-core-contrib-f6b0b260ce18a30d04edfb0afb7942b9f9a5480b.tar.gz
openembedded-core-contrib-f6b0b260ce18a30d04edfb0afb7942b9f9a5480b.tar.bz2
openembedded-core-contrib-f6b0b260ce18a30d04edfb0afb7942b9f9a5480b.zip
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]. Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/rootfs.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index f5c465fbd20..7087b12f252 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -116,6 +116,8 @@ class Rootfs(object):
bb.note(" Copying back package database...")
for dir in dirs:
+ if not os.path.isdir(self.image_rootfs + '-orig' + dir):
+ continue
bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir))
shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True)