Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dunfell][gatesgarth][hardknott][honister] Convert to new override syntax #902

Merged
merged 3 commits into from
Aug 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PYPI_PACKAGE = "argcomplete"

inherit pypi setuptools3

RDEPENDS_${PN} += "\
RDEPENDS:${PN} += "\
${PYTHON_PN}-core \
"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD
inherit cmake

# Header-only library
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
RDEPENDS:${PN}-dev = ""
RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ EXTRA_OECMAKE += "\
-DSPIRV_SKIP_TESTS=ON \
"

do_install_append_class-target() {
do_install:append:class-target() {
# reproducibility: remove build host path
sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \
-e 's:${STAGING_DIR_HOST}::g'
Expand All @@ -36,8 +36,8 @@ SOLIBS = ".so"
FILES_SOLIBSDEV = ""

PACKAGES =+ "${PN}-lesspipe"
FILES_${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh"
RDEPENDS_${PN}-lesspipe += "${PN} bash"
FILES:${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh"
RDEPENDS:${PN}-lesspipe += "${PN} bash"

BBCLASSEXTEND = "native nativesdk"

Expand All @@ -51,5 +51,5 @@ BBCLASSEXTEND = "native nativesdk"

# ERROR: spirv-tools-2020.6-r0 do_package_qa: QA Issue: spirv-tools-lesspipe rdepends on bash, but it isn't a build dependency, missing bash in DEPENDS or PACKAGECONFIG? [build-deps]
VIRTUAL-RUNTIME_bash ?= "bash"
RDEPENDS_${PN}-lesspipe_append_class-target = " ${VIRTUAL-RUNTIME_bash}"
RDEPENDS_${PN}-lesspipe_remove_class-target = "${@oe.utils.conditional('WEBOS_PREFERRED_PROVIDER_FOR_BASH', 'busybox', 'bash', '', d)}"
RDEPENDS:${PN}-lesspipe:append:class-target = " ${VIRTUAL-RUNTIME_bash}"
RDEPENDS:${PN}-lesspipe:remove:class-target = "${@oe.utils.conditional('WEBOS_PREFERRED_PROVIDER_FOR_BASH', 'busybox', 'bash', '', d)}"
4 changes: 2 additions & 2 deletions meta-ros-common/classes/ros_component.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ ROS_SPN ??= "${ROS_BPN}"
ROS_SP ??= "${ROS_SPN}-${PV}"

inherit ros_faulty_solibs
FILES_${PN}_prepend = " \
FILES:${PN}:prepend = " \
${datadir}/${ROS_BPN} \
${libdir}/${PYTHON_DIR} \
${libdir}/${ROS_BPN} \
"

FILES_${PN}-dev_prepend = " \
FILES:${PN}-dev:prepend = " \
${datadir}/${ROS_BPN}/cmake \
"
2 changes: 1 addition & 1 deletion meta-ros-common/classes/ros_faulty_solibs.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# libraries with version number and symlinks without version number to them.
# This class sets up bitbake to handle improper set up software packages.
FILES_SOLIBSDEV = ""
FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
FILES:${PN} += "${libdir}/lib*${SOLIBSDEV}"
4 changes: 2 additions & 2 deletions meta-ros-common/classes/ros_image.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

# Allow images of different ROS_DISTRO-s to be distinguished.
ROS_IMAGE_BASENAME_APPEND ??= "-${ROS_DISTRO}"
IMAGE_BASENAME_append = "${ROS_IMAGE_BASENAME_APPEND}"
IMAGE_BASENAME:append = "${ROS_IMAGE_BASENAME_APPEND}"
# XXX Not sure why this is now needed ...
PROVIDES += "${IMAGE_BASENAME}"

# See https://github.com/agherzan/meta-raspberrypi/blob/master/docs/layer-contents.md -- but why aren't they always included by
# meta-raspberrypi?
IMAGE_INSTALL_append_rpi = " \
IMAGE_INSTALL:append:rpi = " \
${MACHINE_EXTRA_RRECOMMENDS} \
"

Expand Down
6 changes: 3 additions & 3 deletions meta-ros-common/classes/ros_insane_dev_so.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# on setting so-names to indicate ABI breakages between different versions of the
# same library in the same ROS distro. E.g. see
# https://github.com/ros-planning/moveit/commit/0a7a895bb2ae9e171efa101f354826366fa5eaff
INSANE_SKIP_${PN} += "dev-so"
INSANE_SKIP:${PN} += "dev-so"

FILES_${PN}_prepend_ros1-distro = " \
FILES:${PN}:prepend:ros1-distro = " \
${ros_libdir}/lib*${SOLIBS} \
"

FILES_${PN}_prepend_ros2-distro= " \
FILES:${PN}:prepend:ros2-distro= " \
${libdir}/lib*${SOLIBS} \
"
18 changes: 9 additions & 9 deletions meta-ros-common/classes/ros_opt_prefix.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ inherit ${@'python3-dir' if d.getVar('ROS_PYTHON_VERSION') == '3' else 'python-d
PKG_CONFIG_PATH .= ":${PKG_CONFIG_DIR}:${STAGING_DIR_HOST}${ros_libdir}/pkgconfig:${STAGING_DATADIR}/pkgconfig"
PYTHON_SITEPACKAGES_DIR = "${ros_libdir}/${PYTHON_DIR}/site-packages"
export PYTHONPATH = "${STAGING_DIR_NATIVE}${PYTHON_SITEPACKAGES_DIR}"
PYTHONPATH_class-native = "${PYTHON_SITEPACKAGES_DIR}"
PYTHONPATH:class-native = "${PYTHON_SITEPACKAGES_DIR}"

FILES_${PN} += "\
FILES:${PN} += "\
${ros_bindir} ${ros_libexecdir} ${ros_libdir}/lib*.so \
${PYTHON_SITEPACKAGES_DIR} \
${ros_datadir} \
${ros_sysconfdir} \
${ros_stacksdir} \
"

FILES_${PN}-dev += "\
FILES:${PN}-dev += "\
${ros_includedir} \
${ros_libdir}/pkgconfig \
${PYTHON_SITEPACKAGES_DIR}/*.la \
Expand All @@ -46,28 +46,28 @@ FILES_${PN}-dev += "\
${datadir}/${ROS_BPN}/*.template \
"

FILES_${PN}-dbg += "\
FILES:${PN}-dbg += "\
${ros_bindir}/.debug ${ros_libexecdir}/.debug ${ros_libdir}/.debug \
${ros_datadir}/*/bin/.debug \
${PYTHON_SITEPACKAGES_DIR}/.debug \
${PYTHON_SITEPACKAGES_DIR}/*/.debug \
${PYTHON_SITEPACKAGES_DIR}/*/*/.debug \
"

FILES_${PN}-staticdev += "\
FILES:${PN}-staticdev += "\
${ros_libdir}/*.a \
${ros_libdir}/${BPN}/*.a \
"

SYSROOT_DIRS_append = " \
SYSROOT_DIRS:append = " \
${ros_includedir} \
${ros_libdir} \
${ros_datadir} \
${ros_stacksdir} \
${ros_sysconfdir} \
"

SYSROOT_DIRS_NATIVE_append = " \
SYSROOT_DIRS_NATIVE:append = " \
${ros_bindir} \
${ros_libexecdir} \
"
Expand All @@ -83,5 +83,5 @@ SYSROOT_DIRS_NATIVE_append = " \
# filters: found library in wrong location: /usr/opt/ros/melodic/lib/libparams.so
# filters: found library in wrong location: /usr/opt/ros/melodic/lib/libmedian.so
# filters: found library in wrong location: /usr/opt/ros/melodic/lib/libincrement.so [libdir]
INSANE_SKIP_${PN}-dbg += "libdir"
INSANE_SKIP_${PN} += "libdir"
INSANE_SKIP:${PN}-dbg += "libdir"
INSANE_SKIP:${PN} += "libdir"
2 changes: 1 addition & 1 deletion meta-ros-common/classes/ros_recipe_now_generated.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ def ros_recipe_now_generated__get_suffix(d):
pn = bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[0] or 'defaultpkgname'
return bb.utils.contains('ROS_SUPERFLORE_GENERATED_RECIPES', pn, '-notgenerated', '', d)

PN_append = "${@ros_recipe_now_generated__get_suffix(d)}"
PN:append = "${@ros_recipe_now_generated__get_suffix(d)}"
2 changes: 1 addition & 1 deletion meta-ros-common/classes/ros_superflore_generated.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
ROS_SUPERFLORE_GENERATED = "1"

# If superflore found this BPN listed as a build tool, extend the recipe to build BPN-native.
BBCLASSEXTEND_append = "${@bb.utils.contains('ROS_SUPERFLORE_GENERATED_BUILDTOOLS', '${BPN}-native', ' native', '', d)}"
BBCLASSEXTEND:append = "${@bb.utils.contains('ROS_SUPERFLORE_GENERATED_BUILDTOOLS', '${BPN}-native', ' native', '', d)}"

inherit ros_component
4 changes: 2 additions & 2 deletions meta-ros-common/conf/distro/include/ros-common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ MAINTAINER = "Herb Kuta <herb.kuta@lge.com>"

# Use systemd execusively with no sysvinit scripts
# (see https://www.yoctoproject.org/docs/2.6.2/mega-manual/mega-manual.html#selecting-an-initialization-manager).
DISTRO_FEATURES_append = " systemd"
DISTRO_FEATURES:append = " systemd"
VIRTUAL-RUNTIME_init_manager = "systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
VIRTUAL-RUNTIME_initscripts = ""

# Without this, networking has to be started manually.
ROS_CONNECTION_MANAGER ??= "connman"
IMAGE_INSTALL_append = " \
IMAGE_INSTALL:append = " \
${ROS_CONNECTION_MANAGER} \
"
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
# Note that d.getVar() returns None if the variable is unset, and NoneType doesn't have a .split().

DISTRO_FEATURES_NO_LIBC = "${@ ' '.join(sorted(set([f for f in (d.getVar('DISTRO_FEATURES') or '').split() if not f.startswith('libc-')]))) }"
ROS_EXTRA_BUILDCFG_VARS_append = " INHERIT DISTRO_FEATURES_NO_LIBC MACHINE_FEATURES IMAGE_FEATURES"
ROS_EXTRA_BUILDCFG_VARS:append = " INHERIT DISTRO_FEATURES_NO_LIBC MACHINE_FEATURES IMAGE_FEATURES"

# Include LICENSE_FLAGS_WHITELIST unless it's unset or just whitespace.
ROS_EXTRA_BUILDCFG_VARS_append = "${@ ' LICENSE_FLAGS_WHITELIST' if len((d.getVar('LICENSE_FLAGS_WHITELIST') or '').split()) > 0 else '' }"
ROS_EXTRA_BUILDCFG_VARS:append = "${@ ' LICENSE_FLAGS_WHITELIST' if len((d.getVar('LICENSE_FLAGS_WHITELIST') or '').split()) > 0 else '' }"

# Include IMAGE_FSTYPES unless it's unset or just whitespace.
ROS_EXTRA_BUILDCFG_VARS_append = "${@ ' IMAGE_FSTYPES' if len((d.getVar('IMAGE_FSTYPES') or '').split()) > 0 else '' }"
ROS_EXTRA_BUILDCFG_VARS:append = "${@ ' IMAGE_FSTYPES' if len((d.getVar('IMAGE_FSTYPES') or '').split()) > 0 else '' }"
4 changes: 2 additions & 2 deletions meta-ros-common/conf/ros-distro/include/enable-fortran.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# FORTRAN support (derived from openembedded-core/meta/conf/local.conf.sample.extended)
# Enabling FORTRAN
# Note this is not officially supported by OpenEmbedded.
FORTRAN_forcevariable = "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'fortran', '', ',fortran', d)}"
RUNTIMETARGET_append_pn-gcc-runtime = "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'fortran', '', ' libquadmath', d)}"
FORTRAN:forcevariable = "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'fortran', '', ',fortran', d)}"
RUNTIMETARGET:append:pn-gcc-runtime = "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'fortran', '', ' libquadmath', d)}"
2 changes: 1 addition & 1 deletion meta-ros-common/conf/ros-distro/ros-distro.conf
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ROS_DISTRO ??= "${@d.getVar('ROS2_DISTRO') if d.getVar('ROS2_DISTRO') not in (No

# Default to showing DISTRO_NAME and the ROS build environment variable settings in the build configuration.
ROS_EXTRA_BUILDCFG_VARS ?= "DISTRO_NAME ROS_DISTRO ROS_VERSION ROS_PYTHON_VERSION"
BUILDCFG_VARS_append = " ${ROS_EXTRA_BUILDCFG_VARS}"
BUILDCFG_VARS:append = " ${ROS_EXTRA_BUILDCFG_VARS}"

# Ignore metadata that requires meta-raspberrypi if it's not present.
BBMASK += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'raspberrypi', '', 'recipes-bsp/bootfiles/rpi-config_%.bbappend', d)}"
Expand Down
2 changes: 1 addition & 1 deletion meta-ros-common/recipes-core/images/ros-image-core.bb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ DESCRIPTION = "${SUMMARY}"
inherit ros_distro_${ROS_DISTRO}
inherit ${ROS_DISTRO_TYPE}_image

IMAGE_INSTALL_append = " \
IMAGE_INSTALL:append = " \
ros-core \
"
4 changes: 2 additions & 2 deletions meta-ros-common/recipes-core/images/ros-image-sdktest.bb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ IMAGE_ROOTFS_SIZE = "8192"

IMAGE_FEATURES += "ssh-server-openssh"

IMAGE_INSTALL_append_ros1-distro = " roslaunch rostopic roscpp-dev std-msgs-dev"
IMAGE_INSTALL_append_ros2-distro = " ros-core rclcpp-dev std-msgs-dev"
IMAGE_INSTALL:append:ros1-distro = " roslaunch rostopic roscpp-dev std-msgs-dev"
IMAGE_INSTALL:append:ros2-distro = " ros-core rclcpp-dev std-msgs-dev"

TOOLCHAIN_HOST_TASK += "nativesdk-cmake nativesdk-catkin"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require ros-image-core.bb
SUMMARY = "Core ROS image containing all TurtleBot 3 packages"
DESCRIPTION = "${SUMMARY}"

IMAGE_INSTALL_append = " \
IMAGE_INSTALL:append = " \
packagegroup-ros-turtlebot3-core \
packagegroup-ros-turtlebot3-extended \
"
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ require ros-image-core.bb
SUMMARY = "Core ROS image containing core TurtleBot 3 packages"
DESCRIPTION = "${SUMMARY}"

IMAGE_INSTALL_append = " \
IMAGE_INSTALL:append = " \
packagegroup-ros-turtlebot3-core \
"
2 changes: 1 addition & 1 deletion meta-ros-common/recipes-core/images/ros-image-world.bb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ DESCRIPTION = "${SUMMARY}"
inherit ros_distro_${ROS_DISTRO}
inherit ${ROS_DISTRO_TYPE}_image

IMAGE_INSTALL_append = " \
IMAGE_INSTALL:append = " \
packagegroup-ros-world \
"
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@ inherit ros_distro_${ROS_DISTRO}
TURTLEBOT3_PACKAGES_LIDAR ??= " \
hls-lfcd-lds-driver \
"
TURTLEBOT3_PACKAGES_LIDAR_qemux86 = ""
TURTLEBOT3_PACKAGES_LIDAR:qemux86 = ""

# From just above here http://emanual.robotis.com/docs/en/platform/turtlebot3/appendix_raspi_cam/#run-raspicam-node (also see
# http://emanual.robotis.com/docs/en/platform/turtlebot3/applications/#turtlebot-panorama-demo):
TURTLEBOT3_PACKAGES_CAMERA_rpi ??= " \
TURTLEBOT3_PACKAGES_CAMERA:rpi ??= " \
camera-info-manager \
compressed-image-transport \
"
TURTLEBOT3_PACKAGES_CAMERA_rpi_append_ros1-distro = " \
TURTLEBOT3_PACKAGES_CAMERA:rpi:append:ros1-distro = " \
raspicam-node \
"
# raspicam-node depends on userland to provide mmal, but for aarch64 it doesn't provide it.
TURTLEBOT3_PACKAGES_CAMERA_remove_aarch64 = "raspicam-node"
TURTLEBOT3_PACKAGES_CAMERA:remove:aarch64 = "raspicam-node"

TURTLEBOT3_PACKAGES_CAMERA ??= ""

# From http://emanual.robotis.com/docs/en/platform/turtlebot3/raspberry_pi_3_setup/#3-install-dependent-packages-on-turtlebot-pc
RDEPENDS_${PN} = " \
RDEPENDS:${PN} = " \
ros-base \
turtlebot3-bringup \
turtlebot3-msgs \
Expand All @@ -37,12 +37,12 @@ RDEPENDS_${PN} = " \
"

# Anticipate eventual TurtleBot 3 support under ROS 2, when the package names will be different.
RDEPENDS_${PN}_append_ros1-distro = " \
RDEPENDS:${PN}:append:ros1-distro = " \
rosserial-python \
tf \
"

# "turtlebot3-bringup" expects "rosdep init; rosdep update" to have been done on the target. This is ROS 1 only.
RDEPENDS_${PN}_append_ros1-distro = " \
RDEPENDS:${PN}:append:ros1-distro = " \
python-rosdep-data \
"
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ TURTLEBOT3_PACKAGES_REMOTE_PC_DEPENDENCIES = " \
"

# Anticipate eventual TurtleBot 3 support under ROS 2, when the package names will be different.
TURTLEBOT3_PACKAGES_REMOTE_PC_DEPENDENCIES_append_ros1-distro = " \
TURTLEBOT3_PACKAGES_REMOTE_PC_DEPENDENCIES:append:ros1-distro = " \
amcl \
gmapping \
interactive-markers \
Expand All @@ -40,7 +40,7 @@ TURTLEBOT3_PACKAGES_REMOTE_PC_DEPENDENCIES_append_ros1-distro = " \
xacro \
"

RDEPENDS_${PN} = " \
RDEPENDS:${PN} = " \
turtlebot3 \
turtlebot3-applications \
turtlebot3-applications-msgs \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"

inherit packagegroup

RDEPENDS_${PN} += "\
RDEPENDS:${PN} += "\
${@ 'packagegroup-ros-world-melodic' if 'ros1-melodic-layer' in BBFILE_COLLECTIONS.split() else '' } \
${@ 'packagegroup-ros-world-noetic' if 'ros1-noetic-layer' in BBFILE_COLLECTIONS.split() else '' } \
${@ 'packagegroup-ros-world-dashing' if 'ros2-dashing-layer' in BBFILE_COLLECTIONS.split() else '' } \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ DEPENDS += "gtest"
# /usr/src
# Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
# amazon-kvs-sdk-cpp-kinesis-video-pic: 1 installed and not shipped files. [installed-vs-shipped]
do_install_append() {
do_install:append() {
rm -rfv ${D}${prefix}/tst
rm -rfv ${D}${prefix}/src
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SRC_URI += "file://0001-kinesis-video-producer-fix-include-paths.patch;patchdir=
# kinesis-manager expects kinesis-video-producer header files to be in kinesis-video-producer subdirectory
# | /jenkins/mjansa/build-ros/ros2-dashing-thud/tmp-glibc/work/i586-oe-linux/kinesis-manager/2.0.1-1-r0/git/src/kinesis_stream_manager.cpp:19:10: fatal error: kinesis-video-producer/ClientCallbackProvider.h: No such file or directory
# | #include <kinesis-video-producer/ClientCallbackProvider.h>
do_install_append() {
do_install:append() {
install -d ${D}${includedir}/kinesis-video-producer
mv ${D}${includedir}/*.h ${D}${includedir}/kinesis-video-producer/
}
Expand Down
2 changes: 1 addition & 1 deletion meta-ros-common/recipes-devtools/cmake/cmake_%.bbappend
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FILES_${PN}-dev_class-nativesdk = ""
FILES:${PN}-dev:class-nativesdk = ""
4 changes: 2 additions & 2 deletions meta-ros-common/recipes-devtools/ogre/ogre_1.12.8.bb
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ EXTRA_OECMAKE_RVIZ_OGRE_VENDOR = " \

EXTRA_OECMAKE += "${EXTRA_OECMAKE_RVIZ_OGRE_VENDOR}"

FILES_${PN}-dev += "${libdir}/OGRE/cmake ${libdir}/OGRE/*${SOLIBSDEV}"
FILES_${PN} += "${datadir}/OGRE ${libdir}/OGRE"
FILES:${PN}-dev += "${libdir}/OGRE/cmake ${libdir}/OGRE/*${SOLIBSDEV}"
FILES:${PN} += "${datadir}/OGRE ${libdir}/OGRE"
4 changes: 2 additions & 2 deletions meta-ros-common/recipes-devtools/python/python-ecdsa.inc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad80

inherit pypi

# RDEPENDS_default:
RDEPENDS_${PN} += "${PYTHON_PN}-pbr"
# RDEPENDS:default:
RDEPENDS:${PN} += "${PYTHON_PN}-pbr"

BBCLASSEXTEND += "native"
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "3297ebd3cd072f573772f7c7426939a443c62c458d54bb632ff30fd6ec

inherit pypi

RDEPENDS_${PN} += "${PYTHON_PN}-pycrypto ${PYTHON_PN}-ecdsa"
RDEPENDS:${PN} += "${PYTHON_PN}-pycrypto ${PYTHON_PN}-ecdsa"

BBCLASSEXTEND += "native"
4 changes: 2 additions & 2 deletions meta-ros-common/recipes-devtools/python/python-pyassimp.inc
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ SRC_URI[sha256sum] = "266bd4be170d46065b8c2ad0f5396dad10938a6bbf9a566c4e4d56456e
inherit pypi

PACKAGES += "${PN}-examples"
FILES_${PN}-examples += "${datadir}/examples/${PYPI_PACKAGE}/"
FILES_${PN} += "${datadir}/${PYPI_PACKAGE}/README.rst"
FILES:${PN}-examples += "${datadir}/examples/${PYPI_PACKAGE}/"
FILES:${PN} += "${datadir}/${PYPI_PACKAGE}/README.rst"
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "f518d30c641483c8d6c246afae6e4447f816f8300befc6a11c476eeb62

inherit pypi setuptools3

RDEPENDS_${PN} += "\
RDEPENDS:${PN} += "\
${PYTHON_PN}-pyparsing \
${PYTHON_PN}-pyperclip \
${PYTHON_PN}-six \
Expand Down
Loading