[Buildroot] [PATCH v3 1/2] package/xserver_xorg-server: fix init script conflicts

[Yanghao Cheng]

Thank you!

This is my first time submitting a patch, and I am happy to see that it's
committed.
I added the maintenance branch to the patch per the buildroot manual, but I
think I lost it when I reworked the patch for changes.
The maintenance branch I am on is 2023.02.x

Best,
Yanghao

On Sat, Sep 16, 2023 at 6:19 AM Yann E. MORIN <yann.morin.1998 at free.fr>
wrote:

> Yanghao Cheng, All,
>
> On 2023-09-15 15:27 -0700, Yanghao Cheng spake thusly:
> > From: Yanghao Cheng <yanghao.cheng at aioi-atg.com>
> >
> > xdm package also installs a init script that utimately starts X server
> >
> > Signed-off-by: Yanghao Cheng <yanghao.cheng at 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 at 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.  |
>
> '------------------------------^-------^------------------^--------------------'
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.buildroot.org/pipermail/buildroot/attachments/20230918/ab2256f1/attachment-0001.html>