From 5b5fae3a07a00e95e53f4bda7b41bc8348d639e0 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 7 Feb 2019 22:07:58 -0800 Subject: vncx11: Fix dev package do_rootfs failure When building the dev package I see these errors: Collected errors: * check_data_file_clashes: Package x11vnc-dev wants to install file /home/alistair/oe-master/build/tmp-glibc/wor k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfbproto.h But that file is already provided by package * libvncserver-dev * check_data_file_clashes: Package x11vnc-dev wants to install file /home/alistair/oe-master/build/tmp-glibc/wor k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfb.h But that file is already provided by package * libvncserver-dev * check_data_file_clashes: Package x11vnc-dev wants to install file /home/alistair/oe-master/build/tmp-glibc/wor k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfbregion.h But that file is already provided by package * libvncserver-dev * check_data_file_clashes: Package x11vnc-dev wants to install file /home/alistair/oe-master/build/tmp-glibc/wor k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfbconfig.h But that file is already provided by package * libvncserver-dev * check_data_file_clashes: Package x11vnc-dev wants to install file /home/alistair/oe-master/build/tmp-glibc/wor k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/keysym.h But that file is already provided by package * libvncserver-dev * check_data_file_clashes: Package x11vnc-dev wants to install file /home/alistair/oe-master/build/tmp-glibc/wor k/sopine_a64-oe-linux/core-image-weston/1.0-r0/rootfs/usr/include/rfb/rfbclient.h But that file is already provided by package * libvncserver-dev as both libvncserver and x11vnx try to install the same files let's just remove them from x11vnc. Signed-off-by: Alistair Francis Signed-off-by: Khem Raj --- meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb index b047bc4628..774d2c9cb6 100644 --- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.13.bb @@ -32,3 +32,7 @@ do_prepare_sources () { sed -i -e '/^# libtool.m4/q' ${S}/acinclude.m4 } do_patch[postfuncs] += "do_prepare_sources" + +do_install_append() { + rm -rf ${D}/usr/include/rfb +} -- cgit v1.2.3-54-g00ecf