From 5965ca671826a80127627de67f951a4cb3264003 Mon Sep 17 00:00:00 2001 From: Stephen Street Date: Wed, 2 Oct 2024 15:42:10 -0700 Subject: [PATCH] Make colcon python package builds use correct shebang for merge installs --- .../0003-Force-shebang-to-usr-bin-env-python3.patch | 13 +++++++++++++ .../colcon/python3-colcon-core_0.6.1.bb | 1 + 2 files changed, 14 insertions(+) create mode 100644 meta-ros-common/recipes-devtools/colcon/python3-colcon-core/0003-Force-shebang-to-usr-bin-env-python3.patch diff --git a/meta-ros-common/recipes-devtools/colcon/python3-colcon-core/0003-Force-shebang-to-usr-bin-env-python3.patch b/meta-ros-common/recipes-devtools/colcon/python3-colcon-core/0003-Force-shebang-to-usr-bin-env-python3.patch new file mode 100644 index 00000000000..74d61643d9c --- /dev/null +++ b/meta-ros-common/recipes-devtools/colcon/python3-colcon-core/0003-Force-shebang-to-usr-bin-env-python3.patch @@ -0,0 +1,13 @@ +diff --git a/colcon_core/task/python/build.py b/colcon_core/task/python/build.py +index 7181d20..eb82058 100644 +--- a/colcon_core/task/python/build.py ++++ b/colcon_core/task/python/build.py +@@ -73,7 +73,7 @@ class PythonBuildTask(TaskExtensionPoint): + os.path.realpath(args.build_base), + os.path.realpath(args.path)), + 'build', '--build-base', os.path.join( +- args.build_base, 'build'), ++ args.build_base, 'build'), '--executable', '/usr/bin/env python3', + 'install', '--prefix', args.install_base, + '--record', os.path.join(args.build_base, 'install.log'), + # prevent installation of dependencies specified in setup.py diff --git a/meta-ros-common/recipes-devtools/colcon/python3-colcon-core_0.6.1.bb b/meta-ros-common/recipes-devtools/colcon/python3-colcon-core_0.6.1.bb index c0826580c3c..f8c72cf3837 100644 --- a/meta-ros-common/recipes-devtools/colcon/python3-colcon-core_0.6.1.bb +++ b/meta-ros-common/recipes-devtools/colcon/python3-colcon-core_0.6.1.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://setup.cfg;beginline=22;endline=22;md5=3d0bd1ac53c1dd5 SRC_URI += "file://0001-Remove-optional-pytest-dependencies.patch \ file://0002-Fix-regression-when-enitre-workspace-is-symlinked.patch \ + file://0003-Force-shebang-to-usr-bin-env-python3.patch \ " SRC_URI[sha256sum] = "fc14534b2ce745fcc332afc0bb0ddf3e45d5d69c15da15b9471cfb7b0b9edbe9"