summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-10-26 12:14:26 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-15 15:19:55 +0000
commit0cdbd2ad94bf10651877058ea6f3c21df914a165 (patch)
tree94a8116d81ab24cc5b9c95779485126b148e54b3 /scripts/lib
parentde5621631f531b1d274d79df1e9810b3423a23a5 (diff)
downloadpoky-0cdbd2ad94bf10651877058ea6f3c21df914a165.tar.gz
conf: Remove legacy X input drivers
xf86-input-libinput is RRECOMMENDed by xserver-xorg, these legacy drivers are not needed. (From meta-yocto rev: 715f72d7842b4a789a78e7889b2f01cd41f02df8) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/conf/machine/machine.conf4
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips64/conf/machine/machine.conf1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/machine.conf3
5 files changed, 1 insertions, 9 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/machine.conf b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/machine.conf
index 588367a05e..624750c527 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/machine.conf
+++ b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/machine.conf
@@ -8,10 +8,8 @@
8{{ if xserver == "y": }} 8{{ if xserver == "y": }}
9PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 9PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
10XSERVER ?= "xserver-xorg \ 10XSERVER ?= "xserver-xorg \
11 xf86-input-evdev \
12 xf86-input-mouse \
13 xf86-video-fbdev \ 11 xf86-video-fbdev \
14 xf86-input-keyboard" 12 "
15 13
16MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" 14MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree"
17 15
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf
index b319d626f4..37da2535c8 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf
+++ b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf
@@ -27,7 +27,6 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
27{{ if xserver == "y": }} 27{{ if xserver == "y": }}
28PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 28PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
29XSERVER ?= "xserver-xorg \ 29XSERVER ?= "xserver-xorg \
30 xf86-input-evdev \
31 xf86-video-fbdev" 30 xf86-video-fbdev"
32 31
33SERIAL_CONSOLE = "115200 ttyS0" 32SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/conf/machine/machine.conf b/scripts/lib/bsp/substrate/target/arch/mips64/conf/machine/machine.conf
index 3afc5e093e..a8eea2cde2 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/conf/machine/machine.conf
+++ b/scripts/lib/bsp/substrate/target/arch/mips64/conf/machine/machine.conf
@@ -27,7 +27,6 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
27{{ if xserver == "y": }} 27{{ if xserver == "y": }}
28PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 28PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
29XSERVER ?= "xserver-xorg \ 29XSERVER ?= "xserver-xorg \
30 xf86-input-evdev \
31 xf86-video-fbdev" 30 xf86-video-fbdev"
32 31
33SERIAL_CONSOLE = "115200 ttyS0" 32SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf
index 583c5e44fd..352b97231d 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/machine.conf
@@ -71,7 +71,6 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
71{{ if xserver == "y": }} 71{{ if xserver == "y": }}
72PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 72PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
73XSERVER ?= "xserver-xorg \ 73XSERVER ?= "xserver-xorg \
74 xf86-input-evdev \
75 xf86-video-fbdev" 74 xf86-video-fbdev"
76 75
77PREFERRED_VERSION_u-boot ?= "v2016.01%" 76PREFERRED_VERSION_u-boot ?= "v2016.01%"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/machine.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/machine.conf
index 67e1cbd997..91888581e7 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/machine.conf
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/machine.conf
@@ -54,9 +54,6 @@ KERNEL_IMAGETYPE = "bzImage"
54SERIAL_CONSOLE = "115200 ttyS0" 54SERIAL_CONSOLE = "115200 ttyS0"
55XSERVER = "xserver-xorg \ 55XSERVER = "xserver-xorg \
56 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 56 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
57 xf86-input-vmmouse \
58 xf86-input-keyboard \
59 xf86-input-evdev \
60 xf86-video-vmware" 57 xf86-video-vmware"
61 58
62{{ if qemuarch == "arm": }} 59{{ if qemuarch == "arm": }}