]> code.ossystems Code Review - openembedded-core.git/commitdiff
libfm: remove file which conflicts with libfm-extra
authorRoss Burton <ross.burton@intel.com>
Thu, 7 Sep 2017 12:30:35 +0000 (13:30 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Sep 2017 16:30:13 +0000 (17:30 +0100)
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>
meta/recipes-support/libfm/libfm_1.2.5.bb

index aca59e1476a4a3b30cd239cc10c181ccfcc0a466..1ddddfdc990a9226902d667cf904694ebb11cb6c 100644 (file)
@@ -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