浏览代码

package/xserver_xorg-server: don't install init script if nodm is enabled

Both S40xorg and S90nodm tries to run an Xserver on vt1, causing the nodm
one to fail.  If nodm is enabled, then that is likely what the user wants to
run, so skip installing S40xorg.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 735581122aea7b3f2adec69c771121146ebbe0d0)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Peter Korsgaard 4 年之前
父节点
当前提交
11ed6ccd1f
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

+ 3 - 0
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

@@ -216,9 +216,12 @@ 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
+endif
 
 $(eval $(autotools-package))