mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/xserver_xorg-server: fix init script conflicts

Browse Source 
xdm package also installs a init script that utimately starts X server

Signed-off-by: Yanghao Cheng <yanghao.cheng@aioi-atg.com>
[yann.morin.1998@free.fr:
  - don't use $(or ...)
  - slightly reword comment
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit f9cd154467)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yanghao Cheng
2023-09-15 15:27:10 -07:00
committed by Peter Korsgaard
parent e6140d2955
commit 6192cbb061
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@@ -181,8 +181,9 @@ 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 # Install the init script only when neither nodm nor xdm are enabled, as
ifneq ($(BR2_PACKAGE_NODM),y) # they would be responsible for starting the server.
ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),)
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