All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Yanghao Cheng <yanghaobillcheng@gmail.com>
Cc: Yanghao Cheng <yanghao.cheng@aioi-atg.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v3 1/2] package/xserver_xorg-server: fix init script conflicts
Date: Sat, 16 Sep 2023 15:19:30 +0200	[thread overview]
Message-ID: <20230916131930.GE415981@scaer> (raw)
In-Reply-To: <20230915222711.899079-1-yanghaobillcheng@gmail.com>

Yanghao Cheng, All,

On 2023-09-15 15:27 -0700, Yanghao Cheng spake thusly:
> 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>
> ---
> Changes v1 -> v2:
>     - Simplify the condition per Thomas's suggestion
> 
> Changes v2 -> v3: (Suggested by Yann)
> 	- Revert indent added in original patch
> 	- Keep the original number of patches
> 
>  package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 5 +++--
>  1 file changed, 3 insertions(+), 2 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..0390519d6a 100644
> --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> @@ -181,8 +181,9 @@ 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)
> +# init script conflicts with S90nodm and S99xdm
> +ifeq ($(or $(BR2_PACKAGE_NODM), $(BR2_PACKAGE_XAPP_XDM)),)

As Thomas mentioned, in this situation, we do not use $(or ...), but we
just concatenate the values:

    ifeq ($(BR2_PACKAGE_NODM)$(BR2_PACKAGE_XAPP_XDM),)
    ...

> +# Install the init script only when nodm nor xdm aren't enabled

I slightly reworded the comment, bcasue it did not make much sense to
have two similar comments, one outsode, the other inside the conditional
block.

I did the same in the systemd-related change in patch 2.

Both applied to master, thanks.

Regards,
Yann E. MORIN.

>  define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV
>  	$(INSTALL) -D -m 755 package/x11r7/xserver_xorg-server/S40xorg \
>  		$(TARGET_DIR)/etc/init.d/S40xorg
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  parent reply	other threads:[~2023-09-16 13:19 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 ` [Buildroot] [PATCH 1/2] package/xserver_xorg-server: fix init script conflicts Thomas Petazzoni via buildroot
2023-09-15 17:24 ` [Buildroot] [PATCH v2 1/3] " 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     ` Yann E. MORIN [this message]
2023-09-18 17:12       ` [Buildroot] [PATCH v3 1/2] package/xserver_xorg-server: fix init script conflicts 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=20230916131930.GE415981@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@buildroot.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.