1 |
commit: 37b4031d1f22c7b09d35a4c1951e721a0d647801 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 7 15:50:50 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 7 15:55:15 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b4031d |
7 |
|
8 |
dev-util/catkin: install package.xml in /usr/share/ros_packages/$PKG. |
9 |
|
10 |
This fixes rospack warnings and more importantly rospack reading the whole /usr/share hierarchy. |
11 |
Bug #595004 |
12 |
|
13 |
Package-Manager: portage-2.3.1 |
14 |
|
15 |
...tkin-0.7.1-r1.ebuild => catkin-0.7.1-r2.ebuild} | 10 ++++++ |
16 |
dev-util/catkin/catkin-9999.ebuild | 10 ++++++ |
17 |
dev-util/catkin/files/40catkin | 2 +- |
18 |
.../catkin/files/catkin_prefix_path_util_py.patch | 24 ++++++++++++++ |
19 |
dev-util/catkin/files/package_xml.patch | 37 ++++++++++++++++++++++ |
20 |
5 files changed, 82 insertions(+), 1 deletion(-) |
21 |
|
22 |
diff --git a/dev-util/catkin/catkin-0.7.1-r1.ebuild b/dev-util/catkin/catkin-0.7.1-r2.ebuild |
23 |
similarity index 84% |
24 |
rename from dev-util/catkin/catkin-0.7.1-r1.ebuild |
25 |
rename to dev-util/catkin/catkin-0.7.1-r2.ebuild |
26 |
index cf494b1..02c18e9 100644 |
27 |
--- a/dev-util/catkin/catkin-0.7.1-r1.ebuild |
28 |
+++ b/dev-util/catkin/catkin-0.7.1-r2.ebuild |
29 |
@@ -41,6 +41,7 @@ PATCHES=( |
30 |
"${FILESDIR}/catkin_prefix_path.patch" |
31 |
"${FILESDIR}/gnuinstalldirs.patch" |
32 |
"${FILESDIR}/catkin_prefix_path_util_py.patch" |
33 |
+ "${FILESDIR}/package_xml.patch" |
34 |
) |
35 |
|
36 |
src_prepare() { |
37 |
@@ -98,3 +99,12 @@ src_install() { |
38 |
# needed to be considered as a workspace |
39 |
touch "${ED}/usr/.catkin" |
40 |
} |
41 |
+ |
42 |
+pkg_postinst() { |
43 |
+ ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the" |
44 |
+ ewarn "installation path for package.xml files on Gentoo." |
45 |
+ ewarn "In order for ROS to work properly, you will need to reinstall ROS" |
46 |
+ ewarn "packages that have it installed in the old location:" |
47 |
+ ewarn " emerge -1O /usr/share/*/package.xml" |
48 |
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details." |
49 |
+} |
50 |
|
51 |
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild |
52 |
index cf494b1..02c18e9 100644 |
53 |
--- a/dev-util/catkin/catkin-9999.ebuild |
54 |
+++ b/dev-util/catkin/catkin-9999.ebuild |
55 |
@@ -41,6 +41,7 @@ PATCHES=( |
56 |
"${FILESDIR}/catkin_prefix_path.patch" |
57 |
"${FILESDIR}/gnuinstalldirs.patch" |
58 |
"${FILESDIR}/catkin_prefix_path_util_py.patch" |
59 |
+ "${FILESDIR}/package_xml.patch" |
60 |
) |
61 |
|
62 |
src_prepare() { |
63 |
@@ -98,3 +99,12 @@ src_install() { |
64 |
# needed to be considered as a workspace |
65 |
touch "${ED}/usr/.catkin" |
66 |
} |
67 |
+ |
68 |
+pkg_postinst() { |
69 |
+ ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the" |
70 |
+ ewarn "installation path for package.xml files on Gentoo." |
71 |
+ ewarn "In order for ROS to work properly, you will need to reinstall ROS" |
72 |
+ ewarn "packages that have it installed in the old location:" |
73 |
+ ewarn " emerge -1O /usr/share/*/package.xml" |
74 |
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details." |
75 |
+} |
76 |
|
77 |
diff --git a/dev-util/catkin/files/40catkin b/dev-util/catkin/files/40catkin |
78 |
index 46a6edf..469fa37 100644 |
79 |
--- a/dev-util/catkin/files/40catkin |
80 |
+++ b/dev-util/catkin/files/40catkin |
81 |
@@ -1,3 +1,3 @@ |
82 |
CATKIN_PREFIX_PATH=/usr |
83 |
ROS_ROOT=/usr/share/ros |
84 |
-ROS_PACKAGE_PATH=/usr/share |
85 |
+ROS_PACKAGE_PATH=/usr/share/ros_packages |
86 |
|
87 |
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py.patch b/dev-util/catkin/files/catkin_prefix_path_util_py.patch |
88 |
index d978176..e667ea9 100644 |
89 |
--- a/dev-util/catkin/files/catkin_prefix_path_util_py.patch |
90 |
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py.patch |
91 |
@@ -14,3 +14,27 @@ Index: catkin-0.6.16/cmake/templates/_setup_util.py.in |
92 |
# prepend current workspace if not already part of CPP |
93 |
base_path = os.path.dirname(__file__) |
94 |
if base_path not in CMAKE_PREFIX_PATH: |
95 |
+Index: catkin-0.7.1/python/catkin/builder.py |
96 |
+=================================================================== |
97 |
+--- catkin-0.7.1.orig/python/catkin/builder.py |
98 |
++++ catkin-0.7.1/python/catkin/builder.py |
99 |
+@@ -1026,6 +1026,7 @@ def build_workspace_isolated( |
100 |
+ 'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'", |
101 |
+ 'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')", |
102 |
+ 'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)), |
103 |
++ 'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)), |
104 |
+ 'PYTHON_EXECUTABLE': sys.executable, |
105 |
+ 'PYTHON_INSTALL_DIR': get_python_install_dir(), |
106 |
+ } |
107 |
+Index: catkin-0.7.1/test/unit_tests/test_setup_util.py |
108 |
+=================================================================== |
109 |
+--- catkin-0.7.1.orig/test/unit_tests/test_setup_util.py |
110 |
++++ catkin-0.7.1/test/unit_tests/test_setup_util.py |
111 |
+@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa |
112 |
+ 'PYTHON_EXECUTABLE': sys.executable, |
113 |
+ 'PYTHON_INSTALL_DIR': 'pythonX.Y/packages', |
114 |
+ 'CMAKE_PREFIX_PATH_AS_IS': '', |
115 |
++ 'CATKIN_PREFIX_PATH':'', |
116 |
+ }) |
117 |
+ with tempfile.NamedTemporaryFile('w+') as setup_util_file: |
118 |
+ setup_util_file.write(data) |
119 |
|
120 |
diff --git a/dev-util/catkin/files/package_xml.patch b/dev-util/catkin/files/package_xml.patch |
121 |
new file mode 100644 |
122 |
index 00000000..6099f07 |
123 |
--- /dev/null |
124 |
+++ b/dev-util/catkin/files/package_xml.patch |
125 |
@@ -0,0 +1,37 @@ |
126 |
+Index: catkin-0.7.1/cmake/catkin_package.cmake |
127 |
+=================================================================== |
128 |
+--- catkin-0.7.1.orig/cmake/catkin_package.cmake |
129 |
++++ catkin-0.7.1/cmake/catkin_package.cmake |
130 |
+@@ -518,6 +518,6 @@ function(_catkin_package) |
131 |
+ |
132 |
+ # install package.xml |
133 |
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml |
134 |
+- DESTINATION share/${PROJECT_NAME} |
135 |
++ DESTINATION share/ros_packages/${PROJECT_NAME} |
136 |
+ ) |
137 |
+ endfunction() |
138 |
+Index: catkin-0.7.1/cmake/all.cmake |
139 |
+=================================================================== |
140 |
+--- catkin-0.7.1.orig/cmake/all.cmake |
141 |
++++ catkin-0.7.1/cmake/all.cmake |
142 |
+@@ -156,7 +156,7 @@ foreach(filename |
143 |
+ endforeach() |
144 |
+ |
145 |
+ # output catkin version for debugging |
146 |
+-_catkin_package_xml(${CMAKE_BINARY_DIR}/catkin/catkin_generated/version DIRECTORY ${catkin_EXTRAS_DIR}/..) |
147 |
++#_catkin_package_xml(${CMAKE_BINARY_DIR}/catkin/catkin_generated/version DIRECTORY ${catkin_EXTRAS_DIR}/../../ros_packages/catkin) |
148 |
+ message(STATUS "catkin ${catkin_VERSION}") |
149 |
+ # ensure that no current package name is set |
150 |
+ unset(_CATKIN_CURRENT_PACKAGE) |
151 |
+Index: catkin-0.7.1/cmake/catkin_metapackage.cmake |
152 |
+=================================================================== |
153 |
+--- catkin-0.7.1.orig/cmake/catkin_metapackage.cmake |
154 |
++++ catkin-0.7.1/cmake/catkin_metapackage.cmake |
155 |
+@@ -40,6 +40,6 @@ function(catkin_metapackage) |
156 |
+ |
157 |
+ # install package.xml |
158 |
+ install(FILES ${ARG_DIRECTORY}/package.xml |
159 |
+- DESTINATION share/${PROJECT_NAME} |
160 |
++ DESTINATION share/ros_packages/${PROJECT_NAME} |
161 |
+ ) |
162 |
+ endfunction() |