[FIX] shell: Dash support for init_script

Dash does not support passing arguments to the "." command. The default
poky ./oe-init-build-env has this comment:
  # Normally this is called as '. ./oe-init-build-env <builddir>'
  #
  # This works in most shells (not dash), but not all of them pass the arguments
  # when being sourced.  To workaround the shell limitation use "set <builddir>"
  # prior to sourcing this script.

Implement the "set" workaround for dash support.

Also, change current working directory to match oe-init-build-env
expectation of being sourced from its base directory in dash.

Signed-off-by: Yoann Congal <[email protected]>

Author: ycongal-smile

cooker/cooker.py

@@ -1046,6 +1046,7 @@ def shell(self, build_names: List[str], cmd: List[str]):
         init_script = self.config.layer_dir(
             self.distro.BASE_DIRECTORY + "/" + self.distro.BUILD_SCRIPT
         )
+        base_dir = self.config.layer_dir(self.distro.BASE_DIRECTORY)
         shell = os.environ.get("SHELL", "/bin/bash")
 
         if len(cmd) >= 1:
@@ -1055,11 +1056,11 @@ def shell(self, build_names: List[str], cmd: List[str]):
                     str_cmd, build_dir, init_script, shell
                 )
             )
-            full_command_line = ". {} {} > /dev/null || exit 1; {}".format(
-                init_script, build_dir, str_cmd
+            full_command_line = "set {}; . {} {} > /dev/null || exit 1; {}".format(
+                build_dir, init_script, build_dir, str_cmd
             )
             if not CookerCall.os.subprocess_run(
-                [shell, "-c", full_command_line], None, capture_output=False
+                [shell, "-c", full_command_line], base_dir, capture_output=False
             ):
                 fatal_error("Execution of {} failed.".format(full_command_line))
         else:
@@ -1071,7 +1072,13 @@ def shell(self, build_names: List[str], cmd: List[str]):
 
             if not CookerCall.os.replace_process(
                 shell,
-                [shell, "-c", ". {} {}; {}".format(init_script, build_dir, shell)],
+                [
+                    shell,
+                    "-c",
+                    "cd {}; set {}; . {} {}; {}".format(
+                        base_dir, build_dir, init_script, build_dir, shell
+                    ),
+                ],
             ):
                 fatal_error(
                     "could not run interactive shell for {} with {}".format(

test/basic/shell/output.ref

@@ -1,4 +1,6 @@
-exec /bin/sh /bin/sh -c . /layers/poky/oe-init-build-env /builds/build-pi2-base; /bin/sh
-exec /bin/sh /bin/sh -c . /layers/poky/oe-init-build-env /builds/build-qemu; /bin/sh
-/bin/sh -c . /layers/poky/oe-init-build-env /builds/build-qemu > /dev/null || exit 1; echo test
-/bin/sh -c . /layers/poky/oe-init-build-env /builds/build-qemu > /dev/null || exit 1; echo 'test with spaces and quotes "'
+exec /bin/sh /bin/sh -c cd /layers/poky; set /builds/build-pi2-base; . /layers/poky/oe-init-build-env /builds/build-pi2-base; /bin/sh
+exec /bin/sh /bin/sh -c cd /layers/poky; set /builds/build-qemu; . /layers/poky/oe-init-build-env /builds/build-qemu; /bin/sh
+cd /layers/poky
+/bin/sh -c set /builds/build-qemu; . /layers/poky/oe-init-build-env /builds/build-qemu > /dev/null || exit 1; echo test
+cd /layers/poky
+/bin/sh -c set /builds/build-qemu; . /layers/poky/oe-init-build-env /builds/build-qemu > /dev/null || exit 1; echo 'test with spaces and quotes "'