The companion debug filesystem, enabled with IMAGE_GEN_DEBUGFS, was
creating the companion filesystem but was missing the code to actually
package it into a usable filesystem.
The code (and associated documentation) will allow the debugfs to generate a
companion tarball or other image.
Signed-off-by: Mark Hatle <mark.ha...@windriver.com>
---
meta/conf/documentation.conf | 2 ++
meta/conf/local.conf.sample.extended | 9 +++++++++
meta/lib/oe/image.py | 37 ++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+)
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 075ab6a..845559a 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -212,6 +212,8 @@ IMAGE_BOOT_FILES[doc] = "Whitespace separated list of files
from ${DEPLOY_DIR_IM
IMAGE_CLASSES[doc] = "A list of classes that all images should inherit."
IMAGE_FEATURES[doc] = "The primary list of features to include in an image.
Configure this variable in an image recipe."
IMAGE_FSTYPES[doc] = "Formats of root filesystem images that you want to have
created."
+IMAGE_FSTYPES_DEBUGFS[doc] = "Formats of the debug root filesystem images that
you want to have created."
+IMAGE_GEN_DEBUGFS[doc] = "When set to '1', generate a companion debug
object/source filesystem image."
IMAGE_INSTALL[doc] = "Specifies the packages to install into an image. Image
recipes set IMAGE_INSTALL to specify the packages to install into an image
through image.bbclass."
IMAGE_LINGUAS[doc] = "Specifies the list of locales to install into the image
during the root filesystem construction process."
IMAGE_NAME[doc] = "The name of the output image files minus the extension."
diff --git a/meta/conf/local.conf.sample.extended
b/meta/conf/local.conf.sample.extended
index ccdd326..bc765a1 100644
--- a/meta/conf/local.conf.sample.extended
+++ b/meta/conf/local.conf.sample.extended
@@ -165,6 +165,15 @@
# currently an example class is image_types_uboot
# IMAGE_CLASSES = " image_types_uboot"
+# The following options will build a companion 'debug filesystem' in addition
+# to the normal deployable filesystem. This companion system allows a
+# debugger to know the symbols and related sources. It can be used to
+# debug a remote 'production' system without having to add the debug symbols
+# and sources to remote system. If IMAGE_FSTYPES_DEBUGFS is not defined, it
+# defaults to IMAGE_FSTYPES.
+#IMAGE_GEN_DEBUGFS = "1"
+#IMAGE_FSTYPES_DEBUGFS = "tar.gz"
+
# Incremental rpm image generation, the rootfs would be totally removed
# and re-created in the second generation by default, but with
# INC_RPM_IMAGE_GEN = "1", the rpm based rootfs would be kept, and will
diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index f9e9bfd..688df9d 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -373,6 +373,43 @@ class Image(ImageDepGraph):
bb.note("Creating symlinks for %s image ..." % image_type)
self._create_symlinks(subimages)
+ # Process the debug filesystem...
+ if self.d.getVar('IMAGE_GEN_DEBUGFS', True) == "1":
+ bb.note("Processing debugfs image(s) ...")
+ orig_d = self.d
+ debugfs_d = bb.data.createCopy(self.d)
+ self.d = debugfs_d
+
+ self.d.setVar('IMAGE_ROOTFS', orig_d.getVar('IMAGE_ROOTFS', True)
+ '-dbg')
+ self.d.setVar('IMAGE_NAME', orig_d.getVar('IMAGE_NAME', True) +
'-dbg')
+ self.d.setVar('IMAGE_LINK_NAME', orig_d.getVar('IMAGE_LINK_NAME',
True) + '-dbg')
+
+ debugfs_image_fstypes = orig_d.getVar('IMAGE_FSTYPES_DEBUGFS',
True)
+ if debugfs_image_fstypes:
+ self.d.setVar('IMAGE_FSTYPES',
orig_d.getVar('IMAGE_FSTYPES_DEBUGFS', True))
+
+ self._remove_old_symlinks()
+
+ debugfs_image_cmd_groups = self._get_imagecmds()
+
+ for image_cmds in debugfs_image_cmd_groups:
+ # create the images in parallel
+ nproc = multiprocessing.cpu_count()
+ pool = bb.utils.multiprocessingpool(nproc)
+ results = list(pool.imap(generate_image, image_cmds))
+ pool.close()
+ pool.join()
+
+ for result in results:
+ if result is not None:
+ bb.fatal(result)
+
+ for image_type, subimages, script in image_cmds:
+ bb.note("Creating debugfs symlinks for %s image ..." %
image_type)
+ self._create_symlinks(subimages)
+
+ self.d = orig_d
+
execute_pre_post_process(self.d, post_process_cmds)
--
1.9.3
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
