Re: [Buildroot] [PATCH v2 1/3] package/xserver_xorg-server: fix init script conflicts

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 v2 1/3] package/xserver_xorg-server: fix init script conflicts
Date: Fri, 15 Sep 2023 23:19:42 +0200	[thread overview]
Message-ID: <20230915211942.GE2571@scaer> (raw)
In-Reply-To: <20230915172458.3388709-1-yanghaobillcheng@gmail.com>

Yanghao Cheng, All,

On 2023-09-15 10:24 -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>

Thanks for this v2, but there are still a few issues, see below...

> ---
>  .../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)),)

Thomas suggested you change the condition to positive logic. I see you
did that in patch 3/3, but it should have been done right here in this
patch, not in a separate patch.

> +    # 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

    $ make check-package
    package/x11r7/xserver_xorg-server/xserver_xorg-server.mk:189: expected indent with tabs
    package/x11r7/xserver_xorg-server/xserver_xorg-server.mk:190: expected indent with tabs

Also, the "define XSERVER_XORG_SERVER_INSTALL_INIT_SYSV" and "endef"
lines should not be indented: we do not indent the Makefile code, even
when it is in a conditional block.

Can you look into that, and also check patch 2 about systemd, to follow
the same suggestions?

Thanks!

Regards,
Yann E. MORIN.

>  endif
>  
>  $(eval $(autotools-package))
> -- 
> 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