Skip to contentSkip to conversation

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

PATCH New Peter Korsgaard 2 participants 3 messages Jan 30, 2021 – Feb 3, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 +++
 1 file changed, 3 insertions(+)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +3 -0
index 8ac2d17b24..fa8ae13b8c 100644
@@ -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))
Signature · 1 line
2.20.1
#1 lore raw

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

Quoted 8 lines · On Sat, 30 Jan 2021 11:18:33 +0100 Peter Korsgaard <[email protected]> wrote:

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.

---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 +++
 1 file changed, 3 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

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

In reply to Peter Korsgaard
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

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.

Committed to 2020.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard