Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni via buildroot <buildroot@buildroot.org>
To: Yanghao Cheng <yanghaobillcheng@gmail.com>
Cc: Yanghao Cheng <yanghao.cheng@aioi-atg.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/2] package/xserver_xorg-server: fix init script conflicts
Date: Fri, 15 Sep 2023 12:21:03 +0200	[thread overview]
Message-ID: <20230915122103.41ff8af1@windsurf> (raw)
In-Reply-To: <20230914235043.2538981-1-yanghaobillcheng@gmail.com>

Hello,

On Thu, 14 Sep 2023 16:50:43 -0700
Yanghao Cheng <yanghaobillcheng@gmail.com> wrote:

> From: Yanghao Cheng <yanghao.cheng@aioi-atg.com>
> 
> xdm package also installs a init script that utimately starts X server
> 
> Signed-off-by: Yanghao Cheng <yanghao.cheng@aioi-atg.com>

Thanks for your patch, see below one suggestion.

> ---
> Backport to: 2023.02.x
>  .../xserver_xorg-server/xserver_xorg-server.mk     | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> index 593bbd4276..e5df7f7e93 100644
> --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> @@ -181,12 +181,14 @@ 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
> +# init script conflicts with S90nodm and S99xdm
> +ifneq ($(or $(BR2_PACKAGE_NODM), $(BR2_PACKAGE_XAPP_XDM)),)
> +    # NODM or XDM is defined, do not define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
> +else
> +    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

Can be simplified as:

ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),)
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

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  parent reply	other threads:[~2023-09-15 10:21 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-14 23:50 [Buildroot] [PATCH 1/2] package/xserver_xorg-server: fix init script conflicts Yanghao Cheng
2023-09-14 23:50 ` [Buildroot] [PATCH 2/2] package/xserver_xorg-server: Add condition in xserver_xorg-server.mk, and not install systemd unit if nodm or xdm is enabled Yanghao Cheng
2023-09-15 10:21 ` Thomas Petazzoni via buildroot [this message]
2023-09-15 17:24 ` [Buildroot] [PATCH v2 1/3] package/xserver_xorg-server: fix init script conflicts Yanghao Cheng
2023-09-15 17:24   ` [Buildroot] [PATCH v2 2/3] package/xserver_xorg-server: Add condition in xserver_xorg-server.mk, and not install systemd unit if nodm or xdm is enabled Yanghao Cheng
2023-09-15 17:24   ` [Buildroot] [PATCH v2 3/3] package/xserver_xorg-server: fix init script conflicts Yanghao Cheng
2023-09-15 21:19   ` [Buildroot] [PATCH v2 1/3] " Yann E. MORIN
2023-09-15 22:27   ` [Buildroot] [PATCH v3 1/2] " Yanghao Cheng
2023-09-15 22:27     ` [Buildroot] [PATCH v3 2/2] package/xserver_xorg-server: Add condition in xserver_xorg-server.mk Yanghao Cheng
2023-09-24 21:07       ` Peter Korsgaard
2023-09-16 13:19     ` [Buildroot] [PATCH v3 1/2] package/xserver_xorg-server: fix init script conflicts Yann E. MORIN
2023-09-18 17:12       ` Yanghao Cheng
2023-09-24 21:06     ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230915122103.41ff8af1@windsurf \
    --to=buildroot@buildroot.org \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=yanghao.cheng@aioi-atg.com \
    --cc=yanghaobillcheng@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox