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

Merge pull request #581 from bulwahn/python3-manifest-change 

Some recent changes to run with ROS_USE_PYTHON3 = "yes"
This commit is contained in:
Dmitry Rozhkov 2018-02-23 10:04:41 +02:00 committed by GitHub
parent 7f2e8db15c 6ddc0cc518
commit e2566402ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes-devtools/python/python3_%.bbappend Normal file
View File

@ -0,0 +1,8 @@
inherit update-alternatives
ALTERNATIVE_PRIORITY = "80"
ALTERNATIVE_${PN}-core = "python python_config"
ALTERNATIVE_LINK_NAME[python] = "${bindir}/python"
ALTERNATIVE_LINK_NAME[python_config] = "${bindir}/python-config"
ALTERNATIVE_TARGET[python] = "${bindir}/python3"
ALTERNATIVE_TARGET[python_config] = "${bindir}/python3-config"

7
recipes-devtools/python/python_%.bbappend
View File

@ -1,3 +1,10 @@
EXTRA_OECONF += "\ EXTRA_OECONF += "\
--enable-ipv6 \ --enable-ipv6 \
" "
inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN}-core = "python python_config"
ALTERNATIVE_LINK_NAME[python] = "${bindir}/python"
ALTERNATIVE_LINK_NAME[python_config] = "${bindir}/python-config"

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

@ -15,8 +15,9 @@ FILES_${PN} = "${PYTHON_SITEPACKAGES_DIR} ${ros_bindir}/catkin_find"
RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
${PYTHON_PN}-catkin-pkg ${PYTHON_PN}-argparse ${PYTHON_PN}-misc ${PYTHON_PN}-multiprocessing \ ${PYTHON_PN}-catkin-pkg ${PYTHON_PN}-misc ${PYTHON_PN}-multiprocessing \
${PYTHON_PN}-shell ${PYTHON_PN}-subprocess ${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 ''}"
# 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 \
ROS_PKG_SUBDIR = "tools" ROS_PKG_SUBDIR = "tools"
RDEPENDS_${PN} = "\ RDEPENDS_${PN} = "\
${PYTHON_PN}-textutils \ ${@'python-textutils' if d.getVar('PYTHON_PN', True) == 'python2' else ''} \
${PYTHON_PN}-logging \ ${PYTHON_PN}-logging \
${PYTHON_PN}-threading \ ${PYTHON_PN}-threading \
${PYTHON_PN}-rospkg \ ${PYTHON_PN}-rospkg \

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

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