From 764f760bb15060d8529a4c608563eccceeefa34d Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 15 Apr 2018 08:36:18 +0200 Subject: [PATCH] refresh patches after rebasing pull request --- recipes-ros/catkin/catkin.inc | 2 +- ...roper-cross-compilation-with-catkin.patch} | 44 ++++++++++++++++--- ...ARY_PATH-set-in-environment_cache.py.patch | 6 +-- ...-python.cmake-look-for-python3-first.patch | 6 +-- ...ded-by-environment-instead-of-the-ge.patch | 8 ++-- .../0001-use-env-to-get-python-exec.patch | 21 ++++++--- recipes-ros/ros/roslib_1.11.14.bb | 2 +- 7 files changed, 62 insertions(+), 27 deletions(-) rename recipes-ros/catkin/files/{0001-cross-compilation.patch => 0001-allow-proper-cross-compilation-with-catkin.patch} (80%) diff --git a/recipes-ros/catkin/catkin.inc b/recipes-ros/catkin/catkin.inc index 24c7fcf..1039be1 100644 --- a/recipes-ros/catkin/catkin.inc +++ b/recipes-ros/catkin/catkin.inc @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "90a639d67db7f9039487af555e432a5b4b6e339f22892d75d03b823b3f SRC_URI += "\ file://0001-use-python-provided-by-environment-instead-of-the-ge.patch \ - file://0001-cross-compilation.patch \ + file://0001-allow-proper-cross-compilation-with-catkin.patch \ ${@'file://0001-python.cmake-look-for-python3-first.patch' if d.getVar('PYTHON_PN', True) == 'python3' else ''} \ " diff --git a/recipes-ros/catkin/files/0001-cross-compilation.patch b/recipes-ros/catkin/files/0001-allow-proper-cross-compilation-with-catkin.patch similarity index 80% rename from recipes-ros/catkin/files/0001-cross-compilation.patch rename to recipes-ros/catkin/files/0001-allow-proper-cross-compilation-with-catkin.patch index 76c3644..0309579 100644 --- a/recipes-ros/catkin/files/0001-cross-compilation.patch +++ b/recipes-ros/catkin/files/0001-allow-proper-cross-compilation-with-catkin.patch @@ -1,3 +1,30 @@ +From e6179255b99264a51f8733f52d92ca579fbacb61 Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +Date: Sun, 15 Apr 2018 02:11:42 +0200 +Subject: [PATCH] allow proper cross-compilation with catkin + +The original patch is: + +From: Dominique Hunziker +Date: Fri, 2 Jun 2017 12:12:33 +0200 + +I just re-applied it to the current version 0.6.19 and adjusted +the context of the patch as reaction to bitbake warning: + +WARNING: catkin-runtime-0.6.19-r0 do_patch: +Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. + +Upstream-Status: Pending + +Signed-off-by: Lukas Bulwahn +--- + cmake/all.cmake | 1 + + cmake/catkin_package.cmake | 8 ++++++++ + cmake/catkin_strip_root_path.cmake | 32 +++++++++++++++++++++++++++++ + cmake/templates/pkgConfig.cmake.in | 42 ++++++++++++++++++++++++++++++++++---- + 4 files changed, 79 insertions(+), 4 deletions(-) + create mode 100644 cmake/catkin_strip_root_path.cmake + diff --git a/cmake/all.cmake b/cmake/all.cmake index 6910906..e421b76 100644 --- a/cmake/all.cmake @@ -11,10 +38,10 @@ index 6910906..e421b76 100644 debug_message em_expand diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake -index 07613ce..2b13edc 100644 +index 8ef6c48..d6bc68f 100644 --- a/cmake/catkin_package.cmake +++ b/cmake/catkin_package.cmake -@@ -441,6 +441,14 @@ function(_catkin_package) +@@ -432,6 +432,14 @@ function(_catkin_package) # package cmake dir is the folder where the generated pkgConfig.cmake is located set(PKG_CMAKE_DIR "\${${PROJECT_NAME}_DIR}") @@ -68,7 +95,7 @@ index 0000000..ca5c453 + set(${var} ${output} PARENT_SCOPE) +endfunction() diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in -index 4677100..d3b7067 100644 +index d99b811..3af5c71 100644 --- a/cmake/templates/pkgConfig.cmake.in +++ b/cmake/templates/pkgConfig.cmake.in @@ -78,6 +78,15 @@ else() @@ -87,9 +114,9 @@ index 4677100..d3b7067 100644 # warn when using a deprecated package if(NOT "@PROJECT_DEPRECATED@" STREQUAL "") set(_msg "WARNING: package '@PROJECT_NAME@' is deprecated") -@@ -102,7 +111,19 @@ if(NOT "@PROJECT_CMAKE_CONFIG_INCLUDE_DIRS@ " STREQUAL " ") - set(_report "Report the problem to the maintainer '@PROJECT_MAINTAINER@' and request to fix the problem.") - endif() +@@ -95,7 +104,19 @@ if(NOT "@PROJECT_CMAKE_CONFIG_INCLUDE_DIRS@ " STREQUAL " ") + set(@PROJECT_NAME@_INCLUDE_DIRS "") + set(_include_dirs "@PROJECT_CMAKE_CONFIG_INCLUDE_DIRS@") foreach(idir ${_include_dirs}) - if(IS_ABSOLUTE ${idir} AND IS_DIRECTORY ${idir}) + if(IS_ABSOLUTE ${idir} AND CMAKE_CROSSCOMPILING) @@ -108,7 +135,7 @@ index 4677100..d3b7067 100644 set(include ${idir}) elseif("${idir} " STREQUAL "@CATKIN_GLOBAL_INCLUDE_DESTINATION@ ") get_filename_component(include "${@PROJECT_NAME@_DIR}/../../../@CATKIN_GLOBAL_INCLUDE_DESTINATION@" ABSOLUTE) -@@ -123,18 +144,31 @@ foreach(library ${libraries}) +@@ -116,18 +137,31 @@ foreach(library ${libraries}) list(APPEND @PROJECT_NAME@_LIBRARIES ${library}) elseif(TARGET ${library}) list(APPEND @PROJECT_NAME@_LIBRARIES ${library}) @@ -143,3 +170,6 @@ index 4677100..d3b7067 100644 break() endif() endforeach() +-- +2.7.4 + diff --git a/recipes-ros/catkin/files/0001-ignore-LD_LIBRARY_PATH-set-in-environment_cache.py.patch b/recipes-ros/catkin/files/0001-ignore-LD_LIBRARY_PATH-set-in-environment_cache.py.patch index 0721315..2985667 100644 --- a/recipes-ros/catkin/files/0001-ignore-LD_LIBRARY_PATH-set-in-environment_cache.py.patch +++ b/recipes-ros/catkin/files/0001-ignore-LD_LIBRARY_PATH-set-in-environment_cache.py.patch @@ -1,4 +1,4 @@ -From f58947cf910ec4de1a9f093b4eb1fe68e6cfd602 Mon Sep 17 00:00:00 2001 +From 64d33f250beaeb375cc1c93226c2b45a746d51c2 Mon Sep 17 00:00:00 2001 From: Dmitry Rozhkov Date: Thu, 27 Apr 2017 11:04:27 +0300 Subject: [PATCH] ignore LD_LIBRARY_PATH set in environment_cache.py @@ -26,6 +26,7 @@ by bitbake. Upstream-Status: Inappropriate [upstream doesn't use bitbake and the change may break on-target development] Signed-off-by: Dmitry Rozhkov + --- python/catkin/environment_cache.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -43,6 +44,3 @@ index 3defa52..dba2c50 100755 + code.append('export %s="%s"' % (key, value)) else: code.append('set %s=%s' % (key, value)) --- -2.9.3 - diff --git a/recipes-ros/catkin/files/0001-python.cmake-look-for-python3-first.patch b/recipes-ros/catkin/files/0001-python.cmake-look-for-python3-first.patch index 36455eb..ced1b54 100644 --- a/recipes-ros/catkin/files/0001-python.cmake-look-for-python3-first.patch +++ b/recipes-ros/catkin/files/0001-python.cmake-look-for-python3-first.patch @@ -1,4 +1,4 @@ -From 224186a1af40cd3b7efb4f0648a3a4ca6ca1e7fa Mon Sep 17 00:00:00 2001 +From a429081b23223b1d6729da2c9087318bc08a808c Mon Sep 17 00:00:00 2001 From: Dmitry Rozhkov Date: Thu, 6 Apr 2017 15:25:13 +0300 Subject: [PATCH] python.cmake: look for python3 first @@ -6,6 +6,7 @@ Subject: [PATCH] python.cmake: look for python3 first Upstream-Status: Inappropriate [the patch overrides ROS's default to python2] Signed-off-by: Dmitry Rozhkov + --- cmake/python.cmake | 1 + 1 file changed, 1 insertion(+) @@ -22,6 +23,3 @@ index 70f3d26..38f8320 100644 find_package(PythonInterp REQUIRED) message(STATUS "Using PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}") --- -2.9.3 - diff --git a/recipes-ros/catkin/files/0001-use-python-provided-by-environment-instead-of-the-ge.patch b/recipes-ros/catkin/files/0001-use-python-provided-by-environment-instead-of-the-ge.patch index df8fbd1..56dd7a9 100644 --- a/recipes-ros/catkin/files/0001-use-python-provided-by-environment-instead-of-the-ge.patch +++ b/recipes-ros/catkin/files/0001-use-python-provided-by-environment-instead-of-the-ge.patch @@ -1,4 +1,4 @@ -From 431739f10027022b6e3d2cd75cffa04c848cd14d Mon Sep 17 00:00:00 2001 +From 7894487c0d749124c3b0d82fcebff2309a84024a Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Tue, 31 May 2016 15:38:05 +0200 Subject: [PATCH] use python provided by environment instead of the generated @@ -13,12 +13,13 @@ bf12b40c2 [1]. We revert this change here to address the issue #384 [2]. Upstream-Status: Inappropriate [only for our setup] Signed-off-by: Lukas Bulwahn + --- cmake/templates/_setup_util.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/templates/_setup_util.py.in b/cmake/templates/_setup_util.py.in -index cace21c..ff2c6b4 100755 +index 1949c4c..f8807f3 100755 --- a/cmake/templates/_setup_util.py.in +++ b/cmake/templates/_setup_util.py.in @@ -1,4 +1,4 @@ @@ -27,6 +28,3 @@ index cace21c..ff2c6b4 100755 # -*- coding: utf-8 -*- # Software License Agreement (BSD License) --- -1.9.1 - diff --git a/recipes-ros/ros/files/0001-use-env-to-get-python-exec.patch b/recipes-ros/ros/files/0001-use-env-to-get-python-exec.patch index 32bc417..bc228c0 100644 --- a/recipes-ros/ros/files/0001-use-env-to-get-python-exec.patch +++ b/recipes-ros/ros/files/0001-use-env-to-get-python-exec.patch @@ -1,6 +1,17 @@ -diff -u -r new/env-hooks/10.ros.sh.em old/env-hooks/10.ros.sh.em ---- old/env-hooks/10.ros.sh.em 2016-03-04 23:20:35.255706716 +0100 -+++ new/env-hooks/10.ros.sh.em 2016-03-04 23:19:24.727707608 +0100 +From 4254977bbfc67a3083e3881a56b50b729bf57d9f Mon Sep 17 00:00:00 2001 +From: Dominique Hunziker +Date: Fri, 2 Jun 2017 11:57:54 +0200 + +Upstream-Status: Pending + +--- + core/roslib/env-hooks/10.ros.sh.em | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/core/roslib/env-hooks/10.ros.sh.em b/core/roslib/env-hooks/10.ros.sh.em +index caed342..1c64fc4 100644 +--- a/core/roslib/env-hooks/10.ros.sh.em ++++ b/core/roslib/env-hooks/10.ros.sh.em @@ -1,7 +1,7 @@ # generated from ros/env-hooks/10.ros.sh.em @@ -10,7 +21,7 @@ diff -u -r new/env-hooks/10.ros.sh.em old/env-hooks/10.ros.sh.em if [ -n "$ROS_DISTRO" -a "$ROS_DISTRO" != "indigo" ]; then echo "ROS_DISTRO was set to '$ROS_DISTRO' before. Please make sure that the environment does not mix paths from different distributions." -@@ -30,7 +30,7 @@ +@@ -30,7 +30,7 @@ for workspace in workspaces: print(os.pathsep.join(paths)) EOF ) @@ -18,4 +29,4 @@ diff -u -r new/env-hooks/10.ros.sh.em old/env-hooks/10.ros.sh.em +export ROS_PACKAGE_PATH="`/usr/bin/env python -c \"$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH\"`" @[if DEVELSPACE]@ -# env variables in develspace + # env variables in develspace diff --git a/recipes-ros/ros/roslib_1.11.14.bb b/recipes-ros/ros/roslib_1.11.14.bb index 626304d..9919e1e 100644 --- a/recipes-ros/ros/roslib_1.11.14.bb +++ b/recipes-ros/ros/roslib_1.11.14.bb @@ -9,6 +9,6 @@ require ros.inc ROS_PKG_SUBDIR = "core" -SRC_URI += "file://0001-use-env-to-get-python-exec.patch" +SRC_URI += "file://0001-use-env-to-get-python-exec.patch;striplevel=3" RDEPENDS_${PN} = "${PYTHON_PN}-rospkg catkin-runtime"