summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-22 14:51:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:41:42 +0100
commit69d3df9169133d5e05eff25019569fb8974d48c2 (patch)
treeafdf6264538c5f4fc21271289793fd7443de93dd /meta
parente717e28eda703e7b0d3e6513be9e2919de4eec2d (diff)
downloadpoky-69d3df9169133d5e05eff25019569fb8974d48c2.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/rootfs.py4
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):
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 bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir)) 124 bb.utils.mkdirhier(self.image_rootfs + os.path.dirname(dir))
125 shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir) 125 shutil.copytree(self.image_rootfs + '-orig' + dir, self.image_rootfs + dir, symlinks=True)
126 126
127 cpath = oe.cachedpath.CachedPath() 127 cpath = oe.cachedpath.CachedPath()
128 # Copy files located in /usr/lib/debug or /usr/src/debug 128 # Copy files located in /usr/lib/debug or /usr/src/debug
@@ -907,7 +907,7 @@ class OpkgRootfs(DpkgOpkgRootfs):
907 907
908 self.pm.install_complementary() 908 self.pm.install_complementary()
909 909
910 self._setup_dbg_rootfs(['/var/lib/opkg']) 910 self._setup_dbg_rootfs(['/etc', '/var/lib/opkg'])
911 911
912 execute_pre_post_process(self.d, opkg_post_process_cmds) 912 execute_pre_post_process(self.d, opkg_post_process_cmds)
913 913