From 4562d6dc9d9eb9dacf2e55ecde2590fecf857272 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Wed, 18 Sep 2024 13:56:21 -0600 Subject: meta-xilinx-demos: meta-ros2-jazzy: fix liblz4-vendor dependency The automatically-generated ROS recipes for ros2-jazzy create a liblz4-vendor recipe (and dependencies) instead of using upstream liblz4. Remove the liblz4-vendor dependency. Add a "meta-ros2-jazzy" dynamic layer for ros2-jazzy support. Signed-off-by: Trevor Woerner Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-demos/conf/layer.conf | 2 ++ .../meta-ros2-jazzy/recipes-bbappends/rosbag2/liblz4-vendor_%.bbappend | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/liblz4-vendor_%.bbappend diff --git a/meta-xilinx-demos/conf/layer.conf b/meta-xilinx-demos/conf/layer.conf index 2e611dc9..1f4b6b64 100644 --- a/meta-xilinx-demos/conf/layer.conf +++ b/meta-xilinx-demos/conf/layer.conf @@ -22,4 +22,6 @@ openamp-layer:${LAYERDIR}/dynamic-layers/meta-openamp/recipes-*/*/*.bb \ openamp-layer:${LAYERDIR}/dynamic-layers/meta-openamp/recipes-*/*/*.bbappend \ ros-common-layer:${LAYERDIR}/dynamic-layers/meta-ros/meta-ros-common/recipes-*/*/*.bb \ ros-common-layer:${LAYERDIR}/dynamic-layers/meta-ros/meta-ros-common/recipes-*/*/*.bbappend \ +ros-common-layer:${LAYERDIR}/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-*/*/*.bb \ +ros-common-layer:${LAYERDIR}/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-*/*/*.bbappend \ " diff --git a/meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/liblz4-vendor_%.bbappend b/meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/liblz4-vendor_%.bbappend new file mode 100644 index 00000000..7b9bdc42 --- /dev/null +++ b/meta-xilinx-demos/dynamic-layers/meta-ros/meta-ros2-jazzy/recipes-bbappends/rosbag2/liblz4-vendor_%.bbappend @@ -0,0 +1,2 @@ +ROS_EXEC_DEPENDS:remove = "${ROS_UNRESOLVED_DEP-liblz4}" +DEPENDS:remove = "${ROS_UNRESOLVED_DEP-liblz4-dev}" -- cgit v1.2.3-54-g00ecf