summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulius Zaleckas <paulius.zaleckas@gmail.com>2010-11-04 08:58:33 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-11-05 09:26:29 (GMT)
commit1bc5b0bdf1157c700bac96ca5980ff9aa943e225 (patch)
tree0b5b330df96cb423e757e6cf41b6ec203fe4a530
parentc2d6095f9ffb40d73ef0549412092447b7e7d1cc (diff)
downloadbuildroot-1bc5b0bdf1157c700bac96ca5980ff9aa943e225.tar.gz
buildroot-1bc5b0bdf1157c700bac96ca5980ff9aa943e225.tar.bz2
Create X symlink for TinyX
When installing TinyX to target create /usr/bin/X symlink to Xfbdev as it is the only TinyX driver we build. This makes utils like startx happy :) Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES3
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk4
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 8406725..76c4ea4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -61,7 +61,8 @@
xdriver-xf86-video-{sis,sisusb,suncg3,suncg6,suncg14,sunffb},
xdriver-xf86-video-{sunleo,suntcx,tdfx,tga,trident,v4l,vesa},
xdriver-xf86-video-{vmware,voodeo,wsfb,xgi,xgixp},
- xkeyboard-config, xlib_libX11, xstroke, xterm, xvkbd, zlib
+ xkeyboard-config, xlib_libX11, xserver_xorg-server, xstroke,
+ xterm, xvkbd, zlib
Deprecated packages: hotplug, lzma, ng-spice-rework
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index fed8c10..b0babdd 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -73,6 +73,10 @@ endif
ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive --enable-xfbdev \
--disable-glx --disable-dri --disable-xsdl
+define XSERVER_CREATE_X_SYMLINK
+ ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
+endef
+XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev
endif