aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-09-07 13:30:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 17:30:13 +0100
commit1ca7d8d89e35f55082d1708639e2146794730a0c (patch)
tree176e90dcb440a7528f18ce9d5936dc4e7833eab6
parent6e1f8001a0f3c26cce9c692d25987a3c47ff2f74 (diff)
downloadopenembedded-core-contrib-1ca7d8d89e35f55082d1708639e2146794730a0c.tar.gz
libfm: remove file which conflicts with libfm-extra
Both libfm and libfm-extra provide /usr/include/libfm, so remove it from libfm to avoid sysroot conflicts. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-support/libfm/libfm_1.2.5.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb
index aca59e1476..1ddddfdc99 100644
--- a/meta/recipes-support/libfm/libfm_1.2.5.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.5.bb
@@ -32,6 +32,7 @@ do_install_append () {
rm -f ${D}${includedir}/libfm-1.0/fm-xml-file.h
rm -f ${D}${includedir}/libfm-1.0/fm-version.h
rm -f ${D}${includedir}/libfm-1.0/fm-extra.h
+ rm -f ${D}${includedir}/libfm
rm -f ${D}${libdir}/pkgconfig/libfm-extra.pc
rm -f ${D}${libdir}/libfm-extra.so*
rm -f ${D}${libdir}/libfm-extra.a