Fix python soabi

Signed-off-by: Emerson Knapp <[email protected]>
ros-tooling · Aug 16, 2020 · 665878d · 665878d
1 parent 027545d
commit 665878d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/ros_cross_compile/docker/runtime.Dockerfile b/ros_cross_compile/docker/runtime.Dockerfile
@@ -10,5 +10,6 @@ WORKDIR /ros_ws
 ARG INSTALL_PATH
 COPY $INSTALL_PATH/ /ros_ws/install
 
-RUN echo "source /ros_ws/install/setup.bash" >> ~/.bashrc
+RUN echo "source /opt/ros/foxy/setup.bash" >> ~/.bashrc
+RUN echo "source /ros_ws/install/local_setup.bash" >> ~/.bashrc
 ENTRYPOINT /bin/bash
diff --git a/ros_cross_compile/docker_client.py b/ros_cross_compile/docker_client.py
@@ -111,8 +111,6 @@ def _process_build_log(self, log_generator) -> None:
             if line:
                 logger.info(line)
 
-
-
     def run_container(
         self,
         image_name: str,

diff --git a/ros_cross_compile/ros_cross_compile.py b/ros_cross_compile/ros_cross_compile.py
@@ -35,7 +35,7 @@
 from ros_cross_compile.platform import SUPPORTED_ARCHITECTURES
 from ros_cross_compile.platform import SUPPORTED_ROS2_DISTROS
 from ros_cross_compile.platform import SUPPORTED_ROS_DISTROS
-# from ros_cross_compile.runtime import PackageRuntimeImage
+from ros_cross_compile.runtime import PackageRuntimeImage
 from ros_cross_compile.sysroot_creator import CreateSysroot
 from ros_cross_compile.sysroot_creator import prepare_docker_build_environment
 
@@ -46,7 +46,7 @@
     CollectDependencies(),
     CreateSysroot(),
     CrossCompileBuild(),
-    # PackageRuntimeImage(),
+    PackageRuntimeImage(),
 ]
 
 

diff --git a/ros_cross_compile/toolchains/aarch64-gnu.cmake b/ros_cross_compile/toolchains/aarch64-gnu.cmake
@@ -30,5 +30,5 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-set(PYTHON_SOABI cpython-${PY_VERSION}m-${TRIPLE})
+set(PYTHON_SOABI cpython-${PY_VERSION}-${TRIPLE})
 set(THREADS_PTHREAD_ARG "0" CACHE STRING "Result from TRY_RUN" FORCE)
diff --git a/ros_cross_compile/toolchains/armhf-gnu.cmake b/ros_cross_compile/toolchains/armhf-gnu.cmake
@@ -32,5 +32,5 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(CMAKE_INSTALL_RPATH ${CMAKE_SYSROOT}/opt/ros/${ROS_DISTRO}/lib)
 
-set(PYTHON_SOABI cpython-${PY_VERSION}m-${TRIPLE})
+set(PYTHON_SOABI cpython-${PY_VERSION}-${TRIPLE})
 set(THREADS_PTHREAD_ARG 0)