diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-22 14:51:22 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-29 07:34:10 +0100 |
| commit | 5084ed9401250ed269a49d27b303806ab173c5d5 (patch) | |
| tree | 3d51cabe55ebbb68c0f626239fb4b44717e8982c /meta/lib | |
| parent | 1f3cfc77f1dcbfffd319f09591814611f7a5c6bf (diff) | |
| download | openembedded-core-5084ed9401250ed269a49d27b303806ab173c5d5.tar.gz openembedded-core-5084ed9401250ed269a49d27b303806ab173c5d5.tar.bz2 openembedded-core-5084ed9401250ed269a49d27b303806ab173c5d5.zip | |
lib/oe/rootfs: Fix DEBUGFS generation when using opkg
When enabling extra DEBUGFS image generation with opkg, errors are seen like:
ERROR: core-image-minimal-1.0-r0 do_rootfs: Cannot get the installed packages list. Command '/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/bin/opkg -f /media/build1/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/opkg.conf -o /media/build1/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs --force_postinstall --prefer-arch-to-version status' returned 0 and stderr:
Collected errors:
* file_md5sum_alloc: Failed to open file /media/build1/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs/etc/syslog-startup.conf.busybox: No such file or directory.
* file_md5sum_alloc: Failed to open file /media/build1/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs/etc/fstab: No such file or directory.
basically for all CONFFILES in the image. This is due to the file rearranging
the rootfs generation code does. If we preserve the /etc directory,
the avoids the problem.
We need to tell copyfile to preserve symlinks since some are present in /etc.
[YOCTO #9490]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/rootfs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index a95e1b7391..0546c1e321 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -122,7 +122,7 @@ class Rootfs(object): bb.note(" Copying back package database...") for dir in dirs: bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir)) - shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir) + shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True) cpath = oe.cachedpath.CachedPath() # Copy files located in /usr/lib/debug or /usr/src/debug @@ -907,7 +907,7 @@ class OpkgRootfs(DpkgOpkgRootfs): self.pm.install_complementary() - self._setup_dbg_rootfs(['/var/lib/opkg']) + self._setup_dbg_rootfs(['/etc', '/var/lib/opkg']) execute_pre_post_process(self.d, opkg_post_process_cmds) |