[PATCH 2/3] meta-isar: images: mount /proc around multistrap and configscript

[Henning Schild <henning.schild@siemens.com>]

There are packages that expect /proc to be mounted in their
intall-hooks. So we need proc mounted for multistrap. /proc got mounted
in configurescript which is now not needed anymore.

An example for a package that needs /proc mounted is openjdk-8-jre-headless

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta-isar/recipes-core/images/files/debian-configscript.sh   | 2 --
 meta-isar/recipes-core/images/files/raspbian-configscript.sh | 2 --
 meta-isar/recipes-core/images/isar-image-base.bb             | 4 ++++
 meta/recipes-devtools/buildchroot/buildchroot.bb             | 4 ++++
 meta/recipes-devtools/buildchroot/files/configscript.sh      | 2 --
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh
index 698277c..974ad44 100644
--- a/meta-isar/recipes-core/images/files/debian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/debian-configscript.sh
@@ -45,9 +45,7 @@ export LC_ALL=C LANGUAGE=C LANG=C
 
 # Configuring packages
 dpkg --configure -a
-mount proc -t proc /proc
 dpkg --configure -a
-umount /proc
 
 # set the root password if that has not been done before
 grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd
diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
index 61a1aa5..2f5ad40 100644
--- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
@@ -49,9 +49,7 @@ rm /var/lib/dpkg/info/raspberrypi-bootloader-nokernel.postinst
 
 # Configuring packages
 dpkg --configure -a
-mount proc -t proc /proc
 dpkg --configure -a
-umount /proc
 
 # set the root password if that has not been done before
 grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd
diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index f4b0125..cc0423d 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -48,6 +48,9 @@ do_rootfs() {
         -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \
            "${WORKDIR}/multistrap.conf.in" > "${WORKDIR}/multistrap.conf"
 
+    install -d -m 555 ${IMAGE_ROOTFS}/proc
+    sudo mount -t proc none ${IMAGE_ROOTFS}/proc
+    
     # Create root filesystem
     sudo multistrap -a ${DISTRO_ARCH} -d "${IMAGE_ROOTFS}" -f "${WORKDIR}/multistrap.conf" || true
 
@@ -55,6 +58,7 @@ do_rootfs() {
     sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} ${MACHINE_SERIAL} ${BAUDRATE_TTY} \
         ${ROOTFS_DEV}
     sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}"
+    sudo umount ${IMAGE_ROOTFS}/proc
 }
 
 addtask rootfs before do_populate after do_unpack
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index a5a1896..02e6d39 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -51,6 +51,9 @@ do_build() {
         -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \
            "${WORKDIR}/multistrap.conf.in" > "${WORKDIR}/multistrap.conf"
 
+    install -d -m 555 ${IMAGE_ROOTFS}/proc
+    sudo mount -t proc none ${IMAGE_ROOTFS}/proc
+    
     # Create root filesystem
     sudo multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f "${WORKDIR}/multistrap.conf" || true
 
@@ -59,4 +62,5 @@ do_build() {
 
     # Configure root filesystem
     sudo chroot ${BUILDCHROOT_DIR} /configscript.sh
+    sudo umount ${IMAGE_ROOTFS}/proc
 }
diff --git a/meta/recipes-devtools/buildchroot/files/configscript.sh b/meta/recipes-devtools/buildchroot/files/configscript.sh
index 5080ae1..96166e0 100644
--- a/meta/recipes-devtools/buildchroot/files/configscript.sh
+++ b/meta/recipes-devtools/buildchroot/files/configscript.sh
@@ -44,8 +44,6 @@ mount -t devtmpfs -o mode=0755,nosuid devtmpfs /dev
 
 #configuring packages
 dpkg --configure -a
-mount proc -t proc /proc
 dpkg --configure -a
 apt-get update
-umount /proc
 umount /dev
-- 
2.13.6