[Buildroot] [PATCH] package/mtd: make ubihealthd independent of ubifs

[Buildroot] [PATCH] package/mtd: make ubihealthd independent of ubifs

[Baruch Siach]

Since version 2.1.3 ubihealthd can be enabled without of ubifs-utils.

This also fixes usability of enabling BR2_PACKAGE_MTD_UBIHEALTHD.
BR2_PACKAGE_MTD_UBIFS_UTILS is a blind option. The only way to enable it
is to enable BR2_PACKAGE_MTD_MKFSUBIFS that selects it. ubihealthd
dependency on BR2_PACKAGE_MTD_UBIFS_UTILS makes enabling it unintuitive.

Cc: Markus Mayer <mmayer@broadcom.com>
Cc: Matt Weber <matthew.weber@collins.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/mtd/Config.in | 1 -
 package/mtd/mtd.mk    | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index 57ad01971d5f..d0ca3ba6631d 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -146,7 +146,6 @@ config BR2_PACKAGE_MTD_UBIFORMAT
 config BR2_PACKAGE_MTD_UBIHEALTHD
 	bool "ubihealthd"
 	default y
-	depends on BR2_PACKAGE_MTD_UBIFS_UTILS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # getrandom()
 
 config BR2_PACKAGE_MTD_UBIMKVOL
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index a37594b16419..6385b9ee0a2c 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -40,6 +40,12 @@ else
 MTD_CONF_OPTS += --without-ubifs
 endif
 
+ifeq ($(BR2_PACKAGE_MTD_UBIHEALTHD),y)
+MTD_CONF_OPTS += --enable-ubihealthd
+else
+MTD_CONF_OPTS += --disable-ubihealthd
+endif
+
 ifeq ($(BR2_PACKAGE_MTD_TESTS),y)
 MTD_CONF_OPTS += --enable-tests --enable-install-tests
 else
-- 
2.32.0

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/mtd: make ubihealthd independent of ubifs

[Yann E. MORIN]

Baruch, All,

On 2021-08-27 08:02 +0300, Baruch Siach spake thusly:
> Since version 2.1.3 ubihealthd can be enabled without of ubifs-utils.
> 
> This also fixes usability of enabling BR2_PACKAGE_MTD_UBIHEALTHD.
> BR2_PACKAGE_MTD_UBIFS_UTILS is a blind option. The only way to enable it
> is to enable BR2_PACKAGE_MTD_MKFSUBIFS that selects it. ubihealthd
> dependency on BR2_PACKAGE_MTD_UBIFS_UTILS makes enabling it unintuitive.
> 
> Cc: Markus Mayer <mmayer@broadcom.com>
> Cc: Matt Weber <matthew.weber@collins.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Applied to master, thanks.

I was wondering whether that was material for master or next, but after
a quick build of mtd with just ubihealthd enabled, the build was
successful, so it was good for master, as it fixes a discoverability
issue without an obvious regression.

Regards,
Yann E. MORIN.

> ---
>  package/mtd/Config.in | 1 -
>  package/mtd/mtd.mk    | 6 ++++++
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/package/mtd/Config.in b/package/mtd/Config.in
> index 57ad01971d5f..d0ca3ba6631d 100644
> --- a/package/mtd/Config.in
> +++ b/package/mtd/Config.in
> @@ -146,7 +146,6 @@ config BR2_PACKAGE_MTD_UBIFORMAT
>  config BR2_PACKAGE_MTD_UBIHEALTHD
>  	bool "ubihealthd"
>  	default y
> -	depends on BR2_PACKAGE_MTD_UBIFS_UTILS
>  	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # getrandom()
>  
>  config BR2_PACKAGE_MTD_UBIMKVOL
> diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
> index a37594b16419..6385b9ee0a2c 100644
> --- a/package/mtd/mtd.mk
> +++ b/package/mtd/mtd.mk
> @@ -40,6 +40,12 @@ else
>  MTD_CONF_OPTS += --without-ubifs
>  endif
>  
> +ifeq ($(BR2_PACKAGE_MTD_UBIHEALTHD),y)
> +MTD_CONF_OPTS += --enable-ubihealthd
> +else
> +MTD_CONF_OPTS += --disable-ubihealthd
> +endif
> +
>  ifeq ($(BR2_PACKAGE_MTD_TESTS),y)
>  MTD_CONF_OPTS += --enable-tests --enable-install-tests
>  else
> -- 
> 2.32.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/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@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot