diff options
| author | Anders Darander <anders@chargestorm.se> | 2016-05-23 07:03:12 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:34:43 +0100 |
| commit | 6289046a86a64cb2f9d314d1fd99d9ef5ee4f991 (patch) | |
| tree | a00deab7e36626740aaa3cc89d38fd9a7039d78a /meta/lib | |
| parent | 24c0b9913eb4431703c882d8f2cb18a08c18204d (diff) | |
| download | openembedded-core-6289046a86a64cb2f9d314d1fd99d9ef5ee4f991.tar.gz openembedded-core-6289046a86a64cb2f9d314d1fd99d9ef5ee4f991.tar.bz2 openembedded-core-6289046a86a64cb2f9d314d1fd99d9ef5ee4f991.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>
(cherry picked from commit f6b0b260ce18a30d04edfb0afb7942b9f9a5480b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
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 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) |