From 6289046a86a64cb2f9d314d1fd99d9ef5ee4f991 Mon Sep 17 00:00:00 2001 From: Anders Darander Date: Mon, 23 May 2016 07:03:12 +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 (cherry picked from commit f6b0b260ce18a30d04edfb0afb7942b9f9a5480b) Signed-off-by: Armin Kuster --- meta/lib/oe/rootfs.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/lib/oe') diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 95fd3ab7f1..41f08f533c 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -121,6 +121,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