summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 840672511..76c4ea451 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 fed8c10f8..b0babddee 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