|
@@ -176,10 +176,14 @@ XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1
|
|
XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
|
|
XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
|
|
endif
|
|
endif
|
|
|
|
|
|
|
|
+# Install the systemd unit only when nodm nor xdm aren't enabled, as
|
|
|
|
+# they would be responsible for starting the server.
|
|
|
|
+ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),)
|
|
define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD
|
|
define XSERVER_XORG_SERVER_INSTALL_INIT_SYSTEMD
|
|
$(INSTALL) -D -m 0644 package/x11r7/xserver_xorg-server/xorg.service \
|
|
$(INSTALL) -D -m 0644 package/x11r7/xserver_xorg-server/xorg.service \
|
|
$(TARGET_DIR)/usr/lib/systemd/system/xorg.service
|
|
$(TARGET_DIR)/usr/lib/systemd/system/xorg.service
|
|
endef
|
|
endef
|
|
|
|
+endif
|
|
|
|
|
|
# Install the init script only when neither nodm nor xdm are enabled, as
|
|
# Install the init script only when neither nodm nor xdm are enabled, as
|
|
# they would be responsible for starting the server.
|
|
# they would be responsible for starting the server.
|