{noetic} fuse-ros, fuse-ros-doc: use normal file with 'require' inste…

…ad of symlink

* makes it clearer when the original fuse recipe is upgraded and
  'require' fails to parse
* adjust fuse-doc in RDEPENDS so that it doesn't pull fuse-doc package
  from meta-filesystems recipe to the image

meta-ros1-noetic/conf/ros-distro/include/noetic/ros-distro-recipe-blacklist.inc

@@ -864,7 +864,7 @@ PNBLACKLIST[wiimote] ?= "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'python-c
 PNBLACKLIST[wu-ros-tools] ?= "${@bb.utils.contains_any('ROS_WORLD_SKIP_GROUPS', ['qt5', 'pyqt5', 'ogre'], 'qt5: pyqt5: Depends on easy-markers which depend on rviz which requires python-qt-binding which requires meta-qt5 to be included; ogre: depends on easy-markers whcih depends on rviz which depends on ogre which is not available', '', d)}"
 PNBLACKLIST[yosemite-valley] ?= "${@bb.utils.contains('ROS_WORLD_SKIP_GROUPS', 'gazebo', 'Depends on gazebo, gazebo-ros which is not available', '', d)}"
 
-# Renamed to fuse-ros by symlink in recipes-bbappends/fuse to avoid conflict with
+# Renamed to fuse-ros 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

meta-ros1-noetic/recipes-bbappends/fuse/fuse-ros-doc_0.4.2-1.bb

@@ -0,0 +1 @@
+require ../../generated-recipes/fuse/fuse-doc_${PV}.bb

meta-ros1-noetic/recipes-bbappends/fuse/fuse-ros_0.4.2-1.bb

@@ -0,0 +1,4 @@
+require ../../generated-recipes/fuse/fuse_${PV}.bb
+
+ROS_EXEC_DEPENDS_remove = "fuse-doc"
+ROS_EXEC_DEPENDS += "fuse-ros-doc"

meta-ros1-noetic/recipes-core/packagegroups/packagegroup-ros-world-noetic.bb

@@ -29,6 +29,10 @@ RDEPENDS_${PN} += "opencv-apps-ros"
 # with some patches applied on top of prbt-ikfast-manipulator-plugin source
 RDEPENDS_${PN}_remove = "moveit-resources-prbt-ikfast-manipulator-plugin"
 
+# Renamed to fuse-ros and fuse-ros-doc in recipes-bbappends/fuse to avoid conflict with
+# meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb
+RDEPENDS_${PN}_remove = "fuse fuse-doc"
+
 # Requires Python 3; it is not used by any other ROS 1 package.
 RDEPENDS_${PN}_remove = "catkin-virtualenv"
 # Depends on blacklisted catkin-virtualenv