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:36:00 +0100 |
commit | 71ee36304657b18605155c4e85bd7b642eff8a1f (patch) | |
tree | e09534609aceaf50518fab7fc7c9ab2bd52e7ef0 | |
parent | 28066b3a210d92242721398937e85001b9e8aa9b (diff) | |
download | poky-71ee36304657b18605155c4e85bd7b642eff8a1f.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: 6289046a86a64cb2f9d314d1fd99d9ef5ee4f991)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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): | |||
121 | 121 | ||
122 | bb.note(" Copying back package database...") | 122 | bb.note(" Copying back package database...") |
123 | for dir in dirs: | 123 | for dir in dirs: |
124 | if not os.path.isdir(self.image_rootfs + '-orig' + dir): | ||
125 | continue | ||
124 | bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir)) | 126 | bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir)) |
125 | shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True) | 127 | shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True) |
126 | 128 | ||