p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix faulty PR #581 

PYTHON_PN is not equal to 'python2' for Python 2 but 'python'.
This commit is contained in:
Dominique Hunziker 2018-05-05 21:48:00 +02:00
parent cd5934f6cc
commit c017174e78
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-ros/catkin/catkin-runtime_0.6.19.bb
View File

@ -18,7 +18,7 @@ RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
${PYTHON_PN}-catkin-pkg ${PYTHON_PN}-misc ${PYTHON_PN}-multiprocessing \ ${PYTHON_PN}-catkin-pkg ${PYTHON_PN}-misc ${PYTHON_PN}-multiprocessing \
${PYTHON_PN}-shell ${PYTHON_PN}-xml ${PYTHON_PN}-pkgutil \ ${PYTHON_PN}-shell ${PYTHON_PN}-xml ${PYTHON_PN}-pkgutil \
${@'python-argparse python-subprocess' if d.getVar('PYTHON_PN', True) == 'python2' else ''}" ${@'python-argparse python-subprocess' if d.getVar('PYTHON_PN', True) == 'python' else ''}"
# Delete everything but the python packages in order to avoid # Delete everything but the python packages in order to avoid
# that the QA error [installed-vs-shipped] hits on us. # that the QA error [installed-vs-shipped] hits on us.

2
recipes-ros/ros-comm/roslaunch_1.11.21.bb
View File

@ -16,7 +16,7 @@ SRC_URI += "file://0001-increase-rosmaster-timeout.patch;patchdir=../.. \
ROS_PKG_SUBDIR = "tools" ROS_PKG_SUBDIR = "tools"
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
${@'python-textutils' if d.getVar('PYTHON_PN', True) == 'python2' else ''} \ ${@'python-textutils' if d.getVar('PYTHON_PN', True) == 'python' else ''} \
${PYTHON_PN}-logging \ ${PYTHON_PN}-logging \
${PYTHON_PN}-threading \ ${PYTHON_PN}-threading \
${PYTHON_PN}-rospkg \ ${PYTHON_PN}-rospkg \

2
recipes-ros/rospack/rospack_2.2.8.bb
View File

@ -14,4 +14,4 @@ SRC_URI[sha256sum] = "a8fecbe03f9757510fe47137642e39a7c31b823d5bf7fa7890acc11691
inherit catkin inherit catkin
RDEPENDS_${PN} = "${PYTHON_PN}-rosdep \ RDEPENDS_${PN} = "${PYTHON_PN}-rosdep \
${@'python-subprocess' if d.getVar('PYTHON_PN', True) == 'python2' else ''}" ${@'python-subprocess' if d.getVar('PYTHON_PN', True) == 'python' else ''}"