Merge branch 'devel' into docker-multiarch

Author: guysoft

src/custompios

@@ -12,7 +12,7 @@ source ${CUSTOM_PI_OS_PATH}/common.sh
 function execute_chroot_script() {
 
   # In docker, these extra commands are required to enable this black-magic
-  if [ -f /.dockerenv ]; then
+  if [ -f /.dockerenv ] && [ $(arch) != "armv7l" ] ; then
     update-binfmts --enable qemu-arm
     mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc || true
   fi