[yocto] [meta-cloud-services][PATCH 1/14] glusterfs: support usrmerge [LINUXEXEC-1807]

[changqing.li at windriver.com]

From: Changqing Li <changqing.li at windriver.com>

Issue: LINUXEXEC-1807

(LOCAL REV: NOT UPSTREAM) -- send upstream 20190830

Signed-off-by: Changqing Li <changqing.li at windriver.com>
---
 recipes-extended/glusterfs/glusterfs.inc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes-extended/glusterfs/glusterfs.inc b/recipes-extended/glusterfs/glusterfs.inc
index 40a3922..66e2bf1 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -64,9 +64,11 @@ do_install_append() {
     install -m 0755 ${WORKDIR}/glusterd.init \
         ${D}${sysconfdir}/init.d/glusterd
 
-    # Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
-    mkdir -p ${D}${base_sbindir}
-    (cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+    if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then
+        # Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
+        mkdir -p ${D}${base_sbindir}
+        (cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+    fi
 
     # These are plug-ins, so they don't need libtool configs.
     find ${D}${libdir}/glusterfs/${PV} -name '*.la' -exec rm -f '{}' ';'
-- 
2.7.4