Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Meta Ros
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
uav-hds
intel-aero
Meta Ros
Commits
835aa8d9
Commit
835aa8d9
authored
9 years ago
by
Lukas Bulwahn
Browse files
Options
Downloads
Patches
Plain Diff
urdfdom-py: update patch with content from remote repository
parent
1f321081
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
recipes-ros/urdfdom/urdfdom-py/0001-urdf-parser-py-install-scripts-using-catkin_python_s.patch
+15
-13
15 additions, 13 deletions
...rdf-parser-py-install-scripts-using-catkin_python_s.patch
recipes-ros/urdfdom/urdfdom-py_0.3.0.bb
+1
-2
1 addition, 2 deletions
recipes-ros/urdfdom/urdfdom-py_0.3.0.bb
with
16 additions
and
15 deletions
recipes-ros/urdfdom/urdfdom-py/0001-urdf-parser-py-install-scripts-us
e
-catkin_python_s
et
.patch
→
recipes-ros/urdfdom/urdfdom-py/0001-urdf-parser-py-install-scripts-us
ing
-catkin_python_s.patch
+
15
−
13
View file @
835aa8d9
From
e54fcaaecfbaeaa45f5ace25c2b2a959ed5b2b1d
Mon Sep 17 00:00:00 2001
From
f82a1e7cb9ff3f09e5c20467ce4040e6e4d3545c
Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date:
Tue
, 2
5
Ma
r
201
4 08:58:12
+0
1
00
Subject: [PATCH] urdf-parser-py: install scripts us
e
catkin_python_setup
Date:
Wed
, 2
0
Ma
y
201
5 19:41:05
+0
2
00
Subject: [PATCH] urdf-parser-py: install scripts us
ing
catkin_python_setup
To install urdf-parser-py properly with the bitbake recipe in the
meta-ros layer, the install scripts, CMakeLists.txt and setup.py
...
...
@@ -9,7 +9,8 @@ are adjusted. The package.xml file is needed for the new
CMakeLists.txt due to using catkin.
The files were obtained from the urdfdom_py release repository at:
https://github.com/ros-gbp/urdfdom_py-release/tree/4664fc1445f4c75b427dcc6fbad579ba285c1901/hydro
https://github.com/ros-gbp/urdfdom_py-release/tree/5990766f4a164fab8250a384354152737b5acfb7/indigo
(with the latest commit in the indigo directory being c96421515d974d3110f889a3db615dc622886689)
The obtained files were slightly adjusted:
- The version in the package.xml is fixed.
...
...
@@ -19,9 +20,9 @@ The obtained files were slightly adjusted:
Upstream-Status: Inappropriate [source repository shall work without catkin]
---
urdf_parser_py/CMakeLists.txt | 16 ++++++++++------
urdf_parser_py/package.xml | 2
8
++++++++++++++++++++++++++++
urdf_parser_py/package.xml | 2
9 +
++++++++++++++++++++++++++++
urdf_parser_py/setup.py | 18 ++++++------------
3 files changed, 4
4
insertions(+), 18 deletions(-)
3 files changed, 4
5
insertions(+), 18 deletions(-)
create mode 100644 urdf_parser_py/package.xml
diff --git a/urdf_parser_py/CMakeLists.txt b/urdf_parser_py/CMakeLists.txt
...
...
@@ -48,16 +49,16 @@ index c811815..6a48657 100644
+ )
diff --git a/urdf_parser_py/package.xml b/urdf_parser_py/package.xml
new file mode 100644
index 0000000..
c9d2285
index 0000000..
9677831
--- /dev/null
+++ b/urdf_parser_py/package.xml
@@ -0,0 +1,2
8
@@
@@ -0,0 +1,2
9
@@
+<?xml version="1.0"?>
+<package>
+ <name>urdfdom_py</name>
+ <version>0.
2.1
0</version>
+ <version>0.
3.
0</version>
+ <description>A library to access URDFs using the DOM model.</description>
+ <maintainer email="isucan@
willowgarag
e.com">Ioan Sucan</maintainer>
+ <maintainer email="isucan@
googl
e.com">Ioan Sucan</maintainer>
+
+ <license>BSD</license>
+
...
...
@@ -67,7 +68,7 @@ index 0000000..c9d2285
+ <author>Antonio El Khoury</author>
+ <author>Eric Cousineau</author>
+
+ <url type="website">http://ros.org/
wiki/
urdf</url>
+ <url type="website">http://
wiki.
ros.org/urdf</url>
+ <url type="bugtracker">https://github.com/ros/urdfdom/issues</url>
+ <url type="repository">https://github.com/ros/urdfdom</url>
+
...
...
@@ -76,8 +77,9 @@ index 0000000..c9d2285
+
+ <build_depend>python</build_depend>
+
+ <run_depend>python</run_depend>
+ <run_depend>catkin</run_depend>
+ <run_depend>python</run_depend>
+ <run_depend>python-lxml</run_depend>
+
+</package>
diff --git a/urdf_parser_py/setup.py b/urdf_parser_py/setup.py
...
...
@@ -108,5 +110,5 @@ index eeb4c6d..45478d9 100644
setup(**d)
--
1.
8
.3
.2
1.
9
.3
This diff is collapsed.
Click to expand it.
recipes-ros/urdfdom/urdfdom-py_0.3.0.bb
+
1
−
2
View file @
835aa8d9
...
...
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=b441202ba2d6b14d62026cb18bb960ed"
require urdfdom.inc
SRC_URI += "file://0001-urdf-parser-py-install-scripts-us
e
-catkin_python_s
et
.patch;striplevel=2"
SRC_URI += "file://0001-urdf-parser-py-install-scripts-us
ing
-catkin_python_s.patch;striplevel=2"
S = "${WORKDIR}/${ROS_SP}/urdf_parser_py"
inherit catkin
RDEPENDS_${PN} = "python-lxml"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment