From 755cfe388f77e89664e9288c83c6937c90a4759c Mon Sep 17 00:00:00 2001 From: Jean-Francois Dagenais Date: Mon, 11 Feb 2019 13:46:56 -0500 Subject: [PATCH] x11vnc: add uinput dependencies and autoload if fbdev --- .../recipes-graphics/x11vnc/files/uinput-x11vnc.conf | 1 + meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 meta-oe/recipes-graphics/x11vnc/files/uinput-x11vnc.conf diff --git a/meta-oe/recipes-graphics/x11vnc/files/uinput-x11vnc.conf b/meta-oe/recipes-graphics/x11vnc/files/uinput-x11vnc.conf new file mode 100644 index 00000000000..42bc0053c78 --- /dev/null +++ b/meta-oe/recipes-graphics/x11vnc/files/uinput-x11vnc.conf @@ -0,0 +1 @@ +uinput diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index c7024e7bd46..5277854b17a 100644 --- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz;downloadfilename=x11vnc-${PV}.tar.gz\ file://starting-fix.patch \ + ${@bb.utils.contains('DISTRO_FEATURES', 'fbdev', 'file://uinput-x11vnc.conf', '', d)} \ " SRC_URI[md5sum] = "64172e8f896389ec963fff93415f0d93" @@ -36,3 +37,12 @@ PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" PACKAGECONFIG[x11] = "--with-x,--without-x, libxdamage libxext libxfixes libxrandr libxtst virtual/libx11" +RRECOMMENDS_${PN}_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'fbdev', 'kernel-module-uinput', '', d)}" + +do_install_append() { + # Install systemd related configuration file + if ${@bb.utils.contains('DISTRO_FEATURES', 'fbdev', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/modules-load.d + install -m 0644 ${WORKDIR}/uinput-x11vnc.conf ${D}${sysconfdir}/modules-load.d + fi +}