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

Update from virtclass-native to class-native 

As per Section 24.5.15 of the Yocto Manual [1], use of 'virtclass'
overrides has been deprecated since Yocto version 1.6. Update to
the new syntax.

[1] http://www.yoctoproject.org/docs/1.8/mega-manual/mega-manual.html

Signed-off-by: Ash Charles <ashcharles@gmail.com>
This commit is contained in:
Ash Charles 2015-05-28 13:14:52 -07:00
parent dd97989142
commit 790f56ddba
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/ros.bbclass
View File

@ -25,7 +25,7 @@ PREPROCESS_RELOCATE_DIRS += " \
PKG_CONFIG_PATH .= ":${PKG_CONFIG_DIR}:${STAGING_DIR_HOST}${ros_libdir}/pkgconfig:${STAGING_DATADIR}/pkgconfig" PKG_CONFIG_PATH .= ":${PKG_CONFIG_DIR}:${STAGING_DIR_HOST}${ros_libdir}/pkgconfig:${STAGING_DATADIR}/pkgconfig"
PYTHON_SITEPACKAGES_DIR = "${ros_libdir}/${PYTHON_DIR}/site-packages" PYTHON_SITEPACKAGES_DIR = "${ros_libdir}/${PYTHON_DIR}/site-packages"
export PYTHONPATH = "${STAGING_DIR_NATIVE}${PYTHON_SITEPACKAGES_DIR}" export PYTHONPATH = "${STAGING_DIR_NATIVE}${PYTHON_SITEPACKAGES_DIR}"
PYTHONPATH_virtclass-native = "${PYTHON_SITEPACKAGES_DIR}" PYTHONPATH_class-native = "${PYTHON_SITEPACKAGES_DIR}"
FILES_${PN} += "\ FILES_${PN} += "\
${ros_bindir}/* ${ros_libexecdir}/* ${ros_libdir}/lib*.so \ ${ros_bindir}/* ${ros_libexecdir}/* ${ros_libdir}/lib*.so \

2
recipes-ros/catkin/catkin_0.5.90.bb
View File

@ -1,6 +1,6 @@
require catkin.inc require catkin.inc
DEPENDS_virtclass-native += "catkin-runtime" DEPENDS_class-native += "catkin-runtime"
RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-native = ""
RDEPENDS_${PN} = "cmake make binutils binutils-symlinks gcc gcc-symlinks g++ g++-symlinks \ RDEPENDS_${PN} = "cmake make binutils binutils-symlinks gcc gcc-symlinks g++ g++-symlinks \