mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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] (From OE-Core rev: 5084ed9401250ed269a49d27b303806ab173c5d5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user