Use the same qemu binaries as the ones provided in https://github.com…

…/osrf/multiarch-docker-image-generation In order to work around https://bugs.launchpad.net/qemu/+bug/1805913 and so qemu supports renameat2() syscall. Signed-off-by: TSC21 <[email protected]>
ros-tooling · Jun 5, 2021 · 5919344 · 5919344
1 parent d2207a6
commit 5919344
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/ros_cross_compile/qemu/qemu-aarch64-static b/ros_cross_compile/qemu/qemu-aarch64-static
diff --git a/ros_cross_compile/qemu/qemu-arm-static b/ros_cross_compile/qemu/qemu-arm-static
diff --git a/ros_cross_compile/sysroot_creator.py b/ros_cross_compile/sysroot_creator.py
@@ -64,7 +64,13 @@ def setup_emulator(arch: str, output_dir: Path) -> None:
     bin_dir.mkdir(parents=True, exist_ok=True)
     needs_emulator = (py_platform.system() != 'Darwin') and (py_platform.machine() != arch)
     if needs_emulator:
-        emulator_path = Path('/') / 'usr' / 'bin' / emulator_name
+        """
+        Using the same qemu binaries as the ones provided in
+        https://github.com/osrf/multiarch-docker-image-generation in order to
+        work around https://bugs.launchpad.net/qemu/+bug/1805913 and so qemu
+        supports renameat2() syscall.
+        """
+        emulator_path = Path(__file__).parent / 'qemu' / emulator_name
         if not emulator_path.is_file():
             raise RuntimeError('Could not find the expected QEmu emulator binary "{}"'.format(
                 emulator_path))