[PATCH v6 2/2] buildchroot: add sysfs mount since expected by some packages

[Cedric Hombourger <Cedric_Hombourger@mentor.com>]

Some packages look for /sys when they configure, build or test themselves (for
instance golang-google-grpc).

Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
---
 meta/classes/buildchroot.bbclass                    | 2 ++
 meta/classes/image.bbclass                          | 1 +
 meta/classes/isar-bootstrap-helper.bbclass          | 2 ++
 meta/classes/isar-image.bbclass                     | 1 +
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 3 +++
 5 files changed, 9 insertions(+)

diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass
index a8964c6..0d4ff4e 100644
--- a/meta/classes/buildchroot.bbclass
+++ b/meta/classes/buildchroot.bbclass
@@ -30,6 +30,8 @@ buildchroot_do_mounts() {
             mount --rbind /dev ${BUILDCHROOT_DIR}/dev
             mount --make-rslave ${BUILDCHROOT_DIR}/dev
             mount -t proc none ${BUILDCHROOT_DIR}/proc
+            mount --rbind /sys ${BUILDCHROOT_DIR}/sys
+            mount --make-rslave ${BUILDCHROOT_DIR}/sys
         fi
 
         # Refresh /etc/resolv.conf at this chance
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 01e045d..d8fbfd5 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -110,6 +110,7 @@ do_populate_sdk() {
 
     sudo umount -R ${SDKCHROOT_DIR}/rootfs/dev || true
     sudo umount ${SDKCHROOT_DIR}/rootfs/proc || true
+    sudo umount -R ${SDKCHROOT_DIR}/rootfs/sys || true
 
     # Create SDK archive
     sudo tar -C ${SDKCHROOT_DIR} --transform="s|^rootfs|sdk-${DISTRO}-${DISTRO_ARCH}|" \
diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass
index 1d3e5f6..d77690f 100644
--- a/meta/classes/isar-bootstrap-helper.bbclass
+++ b/meta/classes/isar-bootstrap-helper.bbclass
@@ -106,6 +106,8 @@ setup_root_file_system() {
     sudo mount --rbind /dev ${ROOTFSDIR}/dev
     sudo mount --make-rslave ${ROOTFSDIR}/dev
     sudo mount -t proc none $ROOTFSDIR/proc
+    sudo mount --rbind /sys ${ROOTFSDIR}/sys
+    sudo mount --make-rslave ${ROOTFSDIR}/sys
 
     # Refresh /etc/resolv.conf
     sudo cp -L /etc/resolv.conf ${ROOTFSDIR}/etc
diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass
index 703b3e7..7aaaecb 100644
--- a/meta/classes/isar-image.bbclass
+++ b/meta/classes/isar-image.bbclass
@@ -61,6 +61,7 @@ isar_image_cleanup() {
     sudo rmdir ${IMAGE_ROOTFS}/isar-apt
     sudo umount -R -l ${IMAGE_ROOTFS}/dev
     sudo umount -l ${IMAGE_ROOTFS}/proc
+    sudo umount -R -l ${IMAGE_ROOTFS}/sys
     sudo rm -f "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf"
 }
 
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index dfd649e..3f7910f 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -185,6 +185,7 @@ isar_bootstrap() {
             if [ -e "${ROOTFSDIR}" ]; then
                umount -R -l "${ROOTFSDIR}/dev" || true
                umount -l "${ROOTFSDIR}/proc" || true
+               umount -R -l "${ROOTFSDIR}/sys" || true
                rm -rf "${ROOTFSDIR}"
             fi
             if [ ${IS_HOST} ]; then
@@ -246,6 +247,8 @@ isar_bootstrap() {
             mount --rbind /dev ${BUILDCHROOT_DIR}/dev
             mount --make-rslave ${BUILDCHROOT_DIR}/dev
             mount -t proc none ${ROOTFSDIR}/proc
+            mount --rbind /sys ${BUILDCHROOT_DIR}/sys
+            mount --make-rslave ${BUILDCHROOT_DIR}/sys
 
             export DEBIAN_FRONTEND=noninteractive
             chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y
-- 
2.7.4