summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-11-11 16:34:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 08:04:24 +0000
commit757fb421ec498b7c268944ba5d2942d2b286bed8 (patch)
tree1f9d83f7e0e5e305a92a1d5e176d4e8c9deb71b6
parent9057678e75ec09af081b27d5935907ec955c3664 (diff)
downloadopenembedded-core-contrib-757fb421ec498b7c268944ba5d2942d2b286bed8.tar.gz
openembedded-core-contrib-757fb421ec498b7c268944ba5d2942d2b286bed8.tar.bz2
openembedded-core-contrib-757fb421ec498b7c268944ba5d2942d2b286bed8.zip
xorg-driver-input: add xorg configuration to FILES
It's common for input drivers to to add files into ${datadir}/X11/xorg.conf.d/. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-input.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
index 19c122fdf6..32db25b89d 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb
@@ -14,5 +14,3 @@ SRC_URI[md5sum] = "8ed68e8cc674dd61adb280704764aafb"
SRC_URI[sha256sum] = "7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80"
DEPENDS += "libxi mtdev libxtst libevdev"
-
-FILES_${PN} += "${datadir}/X11/xorg.conf.d"
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
index fbec0643ff..21b60c47b2 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
@@ -7,5 +7,7 @@ python add_xorg_abi_depends() {
}
PACKAGEFUNCS =+ "add_xorg_abi_depends"
-FILES_${PN} += " ${libdir}/xorg/modules/input/*.so"
+FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \
+ ${datadir}/X11/xorg.conf.d \
+ "
FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug"