|
@@ -216,9 +216,12 @@ define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD
|
|
$(TARGET_DIR)/usr/lib/systemd/system/xorg.service
|
|
$(TARGET_DIR)/usr/lib/systemd/system/xorg.service
|
|
endef
|
|
endef
|
|
|
|
|
|
|
|
+# init script conflicts with S90nodm
|
|
|
|
+ifneq ($(BR2_PACKAGE_NODM),y)
|
|
define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
|
|
define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
|
|
$(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \
|
|
$(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \
|
|
$(TARGET_DIR)/etc/init.d/S40xorg
|
|
$(TARGET_DIR)/etc/init.d/S40xorg
|
|
endef
|
|
endef
|
|
|
|
+endif
|
|
|
|
|
|
$(eval $(autotools-package))
|
|
$(eval $(autotools-package))
|