diff mbox series

[v2,3/3] package/xserver_xorg-server: fix init script conflicts

Message ID 20230915172458.3388709-3-yanghaobillcheng@gmail.com
State Superseded
Headers show
Series [v2,1/3] package/xserver_xorg-server: fix init script conflicts | expand

Commit Message

Yanghao Cheng Sept. 15, 2023, 5:24 p.m. UTC 
From: Yanghao Cheng <yanghao.cheng@aioi-atg.com>

Simplify the condition per Thomas's suggestion

Signed-off-by: Yanghao Cheng <yanghao.cheng@aioi-atg.com>
---
Changes v1 -> v2:
    - Simplify the condition per Thomas's suggestion

 .../x11r7/xserver_xorg-server/xserver_xorg-server.mk   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 7566541067..6be9eee099 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -177,9 +177,8 @@  XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
 endif
 
 # Systemd unit conflicts with nodm and xdm
-ifneq ($(or $(BR2_PACKAGE_NODM), $(BR2_PACKAGE_XAPP_XDM)),)
-    # NODM or XDM is defined, do not define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD
-else
+ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),)
+# Install the systemd unit only when nodm nor xdm are enabled
 	define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD
 		$(INSTALL) -D -m 0644 package/x11r7/xserver_xorg-server/xorg.service \
 			$(TARGET_DIR)/usr/lib/systemd/system/xorg.service
@@ -187,9 +186,8 @@  else
 endif
 
 # 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
+ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),)
+# Install the init script only when nodm nor xdm are enabled
     define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
         $(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \
             $(TARGET_DIR)/etc/init.d/S40xorg