From f6b0b260ce18a30d04edfb0afb7942b9f9a5480b Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Fri, 20 May 2016 11:01:01 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oe/rootfs.py | 2 ++ 1 file changed, 2 insertions(+) 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): 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) -- cgit 1.2.3-korg