diff --git a/meta-ros1-noetic/conf/ros-distro/include/noetic/ros-distro-recipe-blacklist.inc b/meta-ros1-noetic/conf/ros-distro/include/noetic/ros-distro-recipe-blacklist.inc index e4426a1111a..b6df661d1c2 100644 --- a/meta-ros1-noetic/conf/ros-distro/include/noetic/ros-distro-recipe-blacklist.inc +++ b/meta-ros1-noetic/conf/ros-distro/include/noetic/ros-distro-recipe-blacklist.inc @@ -867,3 +867,5 @@ PNBLACKLIST[yosemite-valley] ?= "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', ' # Renamed to fuse-ros by symlink in recipes-bbappends/fuse to avoid conflict with # meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb BBMASK += "generated-recipes/fuse/fuse_0.4.2-1.bb" +# And renamed fuse-doc to fuse-ros-doc to avoid conflict with PN-doc package created by fuse recipe +BBMASK += "generated-recipes/fuse/fuse-doc_0.4.2-1.bb" diff --git a/meta-ros1-noetic/recipes-bbappends/fuse/fuse-ros-doc_0.4.2-1.bb b/meta-ros1-noetic/recipes-bbappends/fuse/fuse-ros-doc_0.4.2-1.bb new file mode 120000 index 00000000000..5c3d5f1a2ae --- /dev/null +++ b/meta-ros1-noetic/recipes-bbappends/fuse/fuse-ros-doc_0.4.2-1.bb @@ -0,0 +1 @@ +../../generated-recipes/fuse/fuse-doc_0.4.2-1.bb \ No newline at end of file