Re: [Buildroot] [PATCH 1/1] package/wireless_tools: add option to build ifrename

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Brandon, Neal, All,

On 2023-10-19 20:33 +0000, Brandon Maier via buildroot spake thusly:
> From: "Neal J. Buchmeyer" <neal.buchmeyer@collins.com>
> 
> Add option to select ifrename tool which is part of the wireless_tools
> suite. Also add an option to disable iwconfig for targets that only want
> the library or ifrename.

Those are two semantically disjoint changes, so they should be two
patches, preferably in this order:
 1. one to allow only building the library (and make iwconfig optional)
 2. one to add ifrename

Plus, see below...

> Signed-off-by: Neal J. Buchmeyer <neal.buchmeyer@collins.com>
> Signed-off-by: Brandon Maier <brandon.maier@collins.com>
> ---
>  package/wireless_tools/Config.in         | 12 ++++++++++++
>  package/wireless_tools/wireless_tools.mk | 22 ++++++++++++++++------
>  2 files changed, 28 insertions(+), 6 deletions(-)
> 
> diff --git a/package/wireless_tools/Config.in b/package/wireless_tools/Config.in
> index 349908dbde..ad1c2e8e82 100644
> --- a/package/wireless_tools/Config.in
> +++ b/package/wireless_tools/Config.in
> @@ -7,6 +7,18 @@ config BR2_PACKAGE_WIRELESS_TOOLS
>  
>  if BR2_PACKAGE_WIRELESS_TOOLS
>  
> +config BR2_PACKAGE_WIRELESS_TOOLS_IFRENAME
> +	bool "Add ifrename"
> +	help
> +	  Build and install the ifrename tool
> +
> +config BR2_PACKAGE_WIRELESS_TOOLS_IWCONFIG
> +	bool "Add iwconfig"
> +	default y
> +	help
> +	  Build and install the iwconfig, iwlist, iwspy, iwpriv, and
> +	  iwgetid tools.
> +
>  config BR2_PACKAGE_WIRELESS_TOOLS_LIB
>  	bool "Install shared library"
>  	depends on !BR2_STATIC_LIBS
> diff --git a/package/wireless_tools/wireless_tools.mk b/package/wireless_tools/wireless_tools.mk
> index 1d29c3b102..210d8aa51a 100644
> --- a/package/wireless_tools/wireless_tools.mk
> +++ b/package/wireless_tools/wireless_tools.mk
> @@ -14,8 +14,14 @@ WIRELESS_TOOLS_CPE_ID_VERSION = $(WIRELESS_TOOLS_VERSION_MAJOR)
>  WIRELESS_TOOLS_CPE_ID_UPDATE = pre9
>  WIRELESS_TOOLS_INSTALL_STAGING = YES
>  
> -WIRELESS_TOOLS_BUILD_TARGETS = iwmulticall
> -WIRELESS_TOOLS_INSTALL_TARGETS = install-iwmulticall
> +ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_IFRENAME),y)
> +WIRELESS_TOOLS_BUILD_TARGETS += ifrename
> +endif
> +
> +ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_IWCONFIG),y)
> +WIRELESS_TOOLS_BUILD_TARGETS += iwmulticall
> +WIRELESS_TOOLS_INSTALL_TARGETS += install-iwmulticall
> +endif
>  
>  ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_LIB),y)
>  WIRELESS_TOOLS_BUILD_TARGETS += libiw.so.$(WIRELESS_TOOLS_VERSION_MAJOR)
> @@ -30,13 +36,17 @@ endef
>  endif
>  
>  define WIRELESS_TOOLS_BUILD_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
> -		$(WIRELESS_TOOLS_BUILD_TARGETS)
> +	$(if $(WIRELESS_TOOLS_BUILD_TARGETS),
> +		$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" \
> +		CFLAGS="$(TARGET_CFLAGS)" $(WIRELESS_TOOLS_BUILD_TARGETS))
>  endef

So, if none of ifrename, iwconfig, or the library is enabled, then there
is nothjing to build (or to install, below). In this case, it does not
make sense to enable the package altogether.

I think we must ensure that at least one of those are enabled, and
iwconfig looks like the obvious candidate. So (elided for the sake of
example):

    config BR2_PACKAGE_WIRELESS_TOOLS
        bool "wireless tools"
        select BR2_PACKAGE_WIRELESS_TOOLS_IWCONFIG if \
            !BR2_PACKAGE_WIRELESS_TOOLS_IFRENAME && \
            !BR2_PACKAGE_WIRELESS_TOOLS_LIB

Of course, in the first patch, only BR2_PACKAGE_WIRELESS_TOOLS_LIB would
be needed in the condition, with BR2_PACKAGE_WIRELESS_TOOLS_IFRENAME
added in patch 2.

Regards,
Yann E. MORIN.

>  define WIRELESS_TOOLS_INSTALL_TARGET_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" LDCONFIG=/bin/true \
> -		$(WIRELESS_TOOLS_INSTALL_TARGETS)
> +	$(if $(WIRELESS_TOOLS_INSTALL_TARGETS),
> +		$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" \
> +		LDCONFIG=/bin/true $(WIRELESS_TOOLS_INSTALL_TARGETS))
> +	$(if $(BR2_PACKAGE_WIRELESS_TOOLS_IFRENAME),
> +		$(INSTALL) -D -m 755 $(@D)/ifrename $(TARGET_DIR)/sbin/ifrename)
>  endef
>  
>  $(eval $(generic-package))
> -- 
> 2.41.0
> 
> _______________________________________________
> 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