[Buildroot] [git commit branch/2020.11.x] package/xserver_xorg-server: don't install init script if nodm is enabled

Peter Korsgaard peter at korsgaard.com
Wed Feb 3 17:40:49 UTC 2021


commit: https://git.buildroot.net/buildroot/commit/?id=11ed6ccd1f8199cdc2435909f025199c00a15ac1
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.11.x

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 at korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
(cherry picked from commit 735581122aea7b3f2adec69c771121146ebbe0d0)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 8ac2d17b24..fa8ae13b8c 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/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))


More information about the buildroot mailing list