Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/ros/ros-ros
Wookey
8 years ago
|
0 |
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
|
|
1 |
Date: Mon, 16 Nov 2015 18:10:45 +0100
|
|
2 |
Subject: Fix location of etc/ros dir
|
|
3 |
|
|
4 |
---
|
|
5 |
core/roslib/env-hooks/10.ros.sh.em | 2 +-
|
|
6 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
7 |
|
|
8 |
diff --git a/core/roslib/env-hooks/10.ros.sh.em b/core/roslib/env-hooks/10.ros.sh.em
|
|
9 |
index 7a65047..8461f6d 100644
|
|
10 |
--- a/core/roslib/env-hooks/10.ros.sh.em
|
|
11 |
+++ b/core/roslib/env-hooks/10.ros.sh.em
|
|
12 |
@@ -40,7 +40,7 @@ export ROS_ETC_DIR="@(CATKIN_DEVEL_PREFIX)/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros"
|
|
13 |
if [ -z "$CATKIN_ENV_HOOK_WORKSPACE" ]; then
|
|
14 |
CATKIN_ENV_HOOK_WORKSPACE="@(CMAKE_INSTALL_PREFIX)"
|
|
15 |
fi
|
|
16 |
-export ROS_ETC_DIR="$CATKIN_ENV_HOOK_WORKSPACE/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros"
|
|
17 |
+export ROS_ETC_DIR="/@(CATKIN_GLOBAL_ETC_DESTINATION)/ros"
|
|
18 |
@[end if]@
|
|
19 |
|
|
20 |
# unset ROS workspace
|
|
0 |
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
|
|
1 |
Date: Tue, 17 Nov 2015 00:01:41 +0100
|
|
2 |
Subject: Add default ROS_ROOT to rosmake
|
|
3 |
|
|
4 |
---
|
|
5 |
tools/rosmake/src/rosmake/engine.py | 2 ++
|
|
6 |
1 file changed, 2 insertions(+)
|
|
7 |
|
|
8 |
diff --git a/tools/rosmake/src/rosmake/engine.py b/tools/rosmake/src/rosmake/engine.py
|
|
9 |
index 4d07047..5307101 100755
|
|
10 |
--- a/tools/rosmake/src/rosmake/engine.py
|
|
11 |
+++ b/tools/rosmake/src/rosmake/engine.py
|
|
12 |
@@ -381,6 +381,8 @@ class RosMakeAll:
|
|
13 |
with _popen_lock:
|
|
14 |
num_cpus = parallel_build.num_cpus()
|
|
15 |
local_env['ROS_PARALLEL_JOBS'] = "-j%d -l%d" % (num_cpus, num_cpus)
|
|
16 |
+ if 'ROS_ROOT' not in os.environ:
|
|
17 |
+ local_env['ROS_ROOT'] = '/usr/share/ros'
|
|
18 |
local_env['SVN_CMDLINE'] = "svn --non-interactive"
|
|
19 |
cmd = ["bash", "-c", "cd %s && %s "%(self.rospack.get_path(package), make_command()) ] #UNIXONLY
|
|
20 |
if argument:
|
| 1 | 1 |
0002-Add-Debian-specific-SOVERSION.patch
|
| 2 | 2 |
0003-Fix-env-roscreatepkg.patch
|
| 3 | 3 |
0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
|
|
4 |
0005-Fix-location-of-etc-ros-dir.patch
|
|
5 |
0006-Add-default-ROS_ROOT-to-rosmake.patch
|
| 0 | 0 |
usr/bin/rosrun
|
|
1 |
usr/share/rosbash/package.xml
|
| 1 | 2 |
usr/share/rosbash/rosbash etc/bash_completion.d
|
| 2 | 3 |
usr/share/rosbash/roszsh usr/share/zsh/vendor-completions
|