diff --git a/conf/layer.conf b/conf/layer.conf index 9887f99..9200dc4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -10,6 +10,6 @@ BBFILE_PRIORITY_ros-layer = "7" LICENSE_PATH += "${LAYERDIR}/licenses" -LAYERSERIES_COMPAT_ros-layer = "sumo" +LAYERSERIES_COMPAT_ros-layer = "rocko sumo" ROSDISTRO := "indigo" diff --git a/recipes-devtools/python/python-pyyaml_3.11.bb b/recipes-devtools/python/python-pyyaml_3.11.bb deleted file mode 100644 index 9674cc3..0000000 --- a/recipes-devtools/python/python-pyyaml_3.11.bb +++ /dev/null @@ -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" diff --git a/recipes-devtools/yaml-cpp/yaml-cpp_0.6.2.bb b/recipes-devtools/yaml-cpp/yaml-cpp_0.6.2.bb index 8d71b7e..f8e6609 100644 --- a/recipes-devtools/yaml-cpp/yaml-cpp_0.6.2.bb +++ b/recipes-devtools/yaml-cpp/yaml-cpp_0.6.2.bb @@ -15,3 +15,11 @@ SRCREV = "562aefc114938e388457e6a531ed7b54d9dc1b62" EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DYAML_CPP_BUILD_TESTS=OFF" inherit cmake + +PACKAGES =+ "${PN}-gtest" +FILES_${PN}-gtest += " \ + ${libdir}/libgmock_main.so \ + ${libdir}/libgtest_main.so \ + ${libdir}/libgtest.so \ + ${libdir}/libgmock.so \ +" diff --git a/recipes-extended/cmusphinx/sphinxbase_0.8.bb b/recipes-extended/cmusphinx/sphinxbase_0.8.bb index 4a01a8b..fc15e29 100644 --- a/recipes-extended/cmusphinx/sphinxbase_0.8.bb +++ b/recipes-extended/cmusphinx/sphinxbase_0.8.bb @@ -12,7 +12,7 @@ require cmusphinx.inc SRC_URI += "file://0001-TESTS-srcdir-remove.patch" -DEPENDS = "libsndfile1 alsa-lib libsamplerate0" +DEPENDS = "libsndfile1 alsa-lib libsamplerate0 bison-native" EXTRA_OECONF = " --without-python" diff --git a/recipes-ros/mavlink/mavlink_git.bb b/recipes-ros/mavlink/mavlink_git.bb index 144f98e..64b9279 100644 --- a/recipes-ros/mavlink/mavlink_git.bb +++ b/recipes-ros/mavlink/mavlink_git.bb @@ -4,11 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=54ad3cbe91bebcf6b1823970ff1fb97f" DEPENDS = "${PYTHON_PN}-setuptools-native ${PYTHON_PN}-future-native" -SRC_URI = "git://github.com/mavlink/mavlink-gbp-release.git;branch=release/kinetic/mavlink" -SRCREV = "release/kinetic/mavlink/2017.8.8-0" - -SRC_URI += "file://0001-do-not-require-python2.patch" -SRC_URI += "file://0002-provide-path-to-find-mavgen_c.patch" +SRC_URI = "git://github.com/mavlink/mavlink-gbp-release.git;branch=release/kinetic/mavlink \ + file://0001-do-not-require-python2.patch \ + file://0002-provide-path-to-find-mavgen_c.patch \ +" +SRCREV = "7dbef3644782a4297fec76a4a2f7a61705dd624d" +PV = "1.0.9+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-ros/ros-arduino-bridge/ros-arduino-bridge.inc b/recipes-ros/ros-arduino-bridge/ros-arduino-bridge.inc index 58a3eef..72dc98c 100644 --- a/recipes-ros/ros-arduino-bridge/ros-arduino-bridge.inc +++ b/recipes-ros/ros-arduino-bridge/ros-arduino-bridge.inc @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/hbrobotics/${ROS_SPN}.git;protocol=https;branch=hydro-devel" -SRCREV = "${AUTOREV}" +SRCREV = "4f45c3467d724cd7a25db3445f4c98dc759e8fd0" S = "${WORKDIR}/git/${ROS_BPN}"