[PATCH v3 2/2] isar-image: refactor do_rootfs()

[Cedric Hombourger <Cedric_Hombourger@mentor.com>]

Split the do_rootfs() shell function into four (smaller) shell functions to
generate the fstab file (isar_image_gen_fstab), populate the root file-system
(isar_image_gen_rootfs), configure it (isar_image_conf_rootfs) and perform
some house-keeping (isar_image_cleanup). do_rootfs is now a python function
and sequentially calls the helper functions listed above.

Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
---
 meta/classes/isar-image.bbclass | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
index ec2b9e3..e0508be 100644
--- a/meta/classes/isar-image.bbclass
+++ b/meta/classes/isar-image.bbclass
@@ -21,7 +21,7 @@ ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}"
 do_rootfs[root_cleandirs] = "${IMAGE_ROOTFS} \
                              ${IMAGE_ROOTFS}/isar-apt"
 
-do_rootfs() {
+isar_image_gen_fstab() {
     cat > ${WORKDIR}/fstab << EOF
 # Begin /etc/fstab
 /dev/root	/		auto		defaults		0	0
@@ -33,11 +33,15 @@ devtmpfs	/dev		devtmpfs	mode=0755,nosuid	0	0
 
 # End /etc/fstab
 EOF
+}
 
+isar_image_gen_rootfs() {
     setup_root_file_system --clean --keep-apt-cache \
         --fstab "${WORKDIR}/fstab" \
         "${IMAGE_ROOTFS}" ${IMAGE_PREINSTALL} ${IMAGE_INSTALL}
+}
 
+isar_image_conf_rootfs() {
     # Configure root filesystem
     if [ -n "${DISTRO_CONFIG_SCRIPT}" ]; then
         sudo install -m 755 "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" "${IMAGE_ROOTFS}"
@@ -45,7 +49,9 @@ EOF
                                                              "${BAUDRATE_TTY}"
         sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}"
    fi
+}
 
+isar_image_cleanup() {
     # Cleanup
     sudo rm "${IMAGE_ROOTFS}/etc/apt/sources.list.d/isar-apt.list"
     test ! -e "${IMAGE_ROOTFS}/usr/share/doc/qemu-user-static" && \
@@ -57,3 +63,10 @@ EOF
     sudo umount -l ${IMAGE_ROOTFS}/proc
     sudo rm -f "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf"
 }
+
+python do_rootfs() {
+    bb.build.exec_func("isar_image_gen_fstab", d)
+    bb.build.exec_func("isar_image_gen_rootfs", d)
+    bb.build.exec_func("isar_image_conf_rootfs", d)
+    bb.build.exec_func("isar_image_cleanup", d)
+}
-- 
2.11.0