summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-22 16:22:32 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-27 22:48:15 +0200
commita43e7e798c8db5787e2ca943ffd46641d2ebd31e (patch)
treee88e0e4fb1b579f84f93639e477f08d040d48cd6
parentfb04640649750c556916916c2745670a6254ef72 (diff)
xserver: Add xkeyboard-config as a dependency
xkeyboard-config is required to install keymap files to the target, without which the X server does not start. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/x11r7/xserver_xorg-server/Config.in1
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 2d725e448..ddc03c6ae 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -47,6 +47,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XUTIL_UTIL_MACROS
+ select BR2_PACKAGE_XKEYBOARD_CONFIG
depends on !BR2_avr32
help
xorg-server 1.7.5
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index da288b1ca..d9ea57083 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -53,6 +53,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_xf86rushproto \
xproto_xf86vidmodeproto \
xproto_xproto \
+ xkeyboard-config \
pixman \
openssl \
mcookie