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

Merge pull request #608 from shr-project/jansa/compat 

various build fixes
This commit is contained in:
Dmitry Rozhkov 2018-08-26 11:51:19 +03:00 committed by GitHub
parent ad00e80bd4 c1d9ef998b
commit 21d16bc08f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/layer.conf
View File

@ -10,6 +10,6 @@ BBFILE_PRIORITY_ros-layer = "7"
LICENSE_PATH += "${LAYERDIR}/licenses" LICENSE_PATH += "${LAYERDIR}/licenses"
LAYERSERIES_COMPAT_ros-layer = "sumo" LAYERSERIES_COMPAT_ros-layer = "rocko sumo"
ROSDISTRO := "indigo" ROSDISTRO := "indigo"

18
recipes-devtools/python/python-pyyaml_3.11.bb
View File

@ -1,18 +0,0 @@
DESCRIPTION = "YAML parser and emitter for Python"
SECTION = "devel/python"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17"
SRCNAME = "PyYAML"
SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-${PV}.tar.gz"
SRC_URI[md5sum] = "f50e08ef0fe55178479d3a618efe21db"
SRC_URI[sha256sum] = "c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8"
S = "${WORKDIR}/${SRCNAME}-${PV}"
RDEPENDS_${PN} = "python-datetime"
inherit distutils
BBCLASSEXTEND = "native"

8
recipes-devtools/yaml-cpp/yaml-cpp_0.6.2.bb
View File

@ -15,3 +15,11 @@ SRCREV = "562aefc114938e388457e6a531ed7b54d9dc1b62"
EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF" EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF"
inherit cmake inherit cmake
PACKAGES =+ "${PN}-gtest"
FILES_${PN}-gtest += " \
${libdir}/libgmock_main.so \
${libdir}/libgtest_main.so \
${libdir}/libgtest.so \
${libdir}/libgmock.so \
"

2
recipes-extended/cmusphinx/sphinxbase_0.8.bb
View File

@ -12,7 +12,7 @@ require cmusphinx.inc
SRC_URI += "file://0001-TESTS-srcdir-remove.patch" SRC_URI += "file://0001-TESTS-srcdir-remove.patch"
DEPENDS = "libsndfile1 alsa-lib libsamplerate0" DEPENDS = "libsndfile1 alsa-lib libsamplerate0 bison-native"
EXTRA_OECONF = " --without-python" EXTRA_OECONF = " --without-python"

11
recipes-ros/mavlink/mavlink_git.bb
View File

@ -4,11 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=54ad3cbe91bebcf6b1823970ff1fb97f"
DEPENDS = "${PYTHON_PN}-setuptools-native ${PYTHON_PN}-future-native" DEPENDS = "${PYTHON_PN}-setuptools-native ${PYTHON_PN}-future-native"
SRC_URI = "git://github.com/mavlink/mavlink-gbp-release.git;branch=release/kinetic/mavlink" SRC_URI = "git://github.com/mavlink/mavlink-gbp-release.git;branch=release/kinetic/mavlink \
SRCREV = "release/kinetic/mavlink/2017.8.8-0" file://0001-do-not-require-python2.patch \
file://0002-provide-path-to-find-mavgen_c.patch \
SRC_URI += "file://0001-do-not-require-python2.patch" "
SRC_URI += "file://0002-provide-path-to-find-mavgen_c.patch" SRCREV = "7dbef3644782a4297fec76a4a2f7a61705dd624d"
PV = "1.0.9+git${SRCPV}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"

2
recipes-ros/ros-arduino-bridge/ros-arduino-bridge.inc
View File

@ -1,5 +1,5 @@
SRC_URI = "git://github.com/hbrobotics/${ROS_SPN}.git;protocol=https;branch=hydro-devel" SRC_URI = "git://github.com/hbrobotics/${ROS_SPN}.git;protocol=https;branch=hydro-devel"
SRCREV = "${AUTOREV}" SRCREV = "4f45c3467d724cd7a25db3445f4c98dc759e8fd0"
S = "${WORKDIR}/git/${ROS_BPN}" S = "${WORKDIR}/git/${ROS_BPN}"