diff options
| author | Changqing Li <changqing.li@windriver.com> | 2019-08-30 14:10:03 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-09-03 15:51:19 -0400 |
| commit | bd81d776d4debf4966c555b4c325bb1536c64049 (patch) | |
| tree | 6ce7d07ce0e685e926f421591ab926d4687700e2 /recipes-extended | |
| parent | 50500fea06637606f2d4194520608fbd71904164 (diff) | |
| download | meta-cloud-services-bd81d776d4debf4966c555b4c325bb1536c64049.tar.gz | |
glusterfs: support usrmerge
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended')
| -rw-r--r-- | recipes-extended/glusterfs/glusterfs.inc | 8 |
1 files 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() { | |||
| 64 | install -m 0755 ${WORKDIR}/glusterd.init \ | 64 | install -m 0755 ${WORKDIR}/glusterd.init \ |
| 65 | ${D}${sysconfdir}/init.d/glusterd | 65 | ${D}${sysconfdir}/init.d/glusterd |
| 66 | 66 | ||
| 67 | # Mount looks for mount.* plug-ins in /sbin; fix it with a symlink. | 67 | if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then |
| 68 | mkdir -p ${D}${base_sbindir} | 68 | # Mount looks for mount.* plug-ins in /sbin; fix it with a symlink. |
| 69 | (cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .) | 69 | mkdir -p ${D}${base_sbindir} |
| 70 | (cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .) | ||
| 71 | fi | ||
| 70 | 72 | ||
| 71 | # These are plug-ins, so they don't need libtool configs. | 73 | # These are plug-ins, so they don't need libtool configs. |
| 72 | find ${D}${libdir}/glusterfs/${PV} -name '*.la' -exec rm -f '{}' ';' | 74 | find ${D}${libdir}/glusterfs/${PV} -name '*.la' -exec rm -f '{}' ';' |