[Buildroot] [PATCH v2 1/3] package/xserver_xorg-server: fix init script conflicts

[Yanghao Cheng]

From: Yanghao Cheng <yanghao.cheng at aioi-atg.com>

xdm package also installs a init script that utimately starts X server

Signed-off-by: Yanghao Cheng <yanghao.cheng at aioi-atg.com>
---
 .../xserver_xorg-server/xserver_xorg-server.mk     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 593bbd4276..e5df7f7e93 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -181,12 +181,14 @@ define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/usr/lib/systemd/system/xorg.service
 endef
 
-# init script conflicts with S90nodm
-ifneq ($(BR2_PACKAGE_NODM),y)
-define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \
-		$(TARGET_DIR)/etc/init.d/S40xorg
-endef
+# init script conflicts with S90nodm and S99xdm
+ifneq ($(or $(BR2_PACKAGE_NODM), $(BR2_PACKAGE_XAPP_XDM)),)
+    # NODM or XDM is defined, do not define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
+else
+    define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
+        $(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \
+            $(TARGET_DIR)/etc/init.d/S40xorg
+    endef
 endif
 
 $(eval $(autotools-package))
-- 
2.25.1