[PATCH] fixup! string: import strverscmp_improved from systemd

[PATCH] fixup! string: import strverscmp_improved from systemd

[Ahmad Fatoum]

lib: revert CONFIG_STMP_DEVICE prompt visibility

CONFIG_STMP_DEVICE is unrelated to the strverscmp changes and I touched
it by mistake when I sought to remove VERSION_CMP's prompt. Fix this.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 lib/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Kconfig b/lib/Kconfig
index 84d2a2573625..758197b60866 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -107,7 +107,7 @@ config IMAGE_SPARSE
 	bool
 
 config STMP_DEVICE
-	bool "STMP device support"
+	bool "STMP device support" if COMPILE_TEST
 
 config FSL_QE_FIRMWARE
 	select CRC32
@@ -168,7 +168,7 @@ config PROGRESS_NOTIFIER
 	  progress, like blinking a LED during an update.
 
 config VERSION_CMP
-	bool "version comparison utilities" if COMPILE_TEST
+	bool
 	help
 	  This is selected by code that needs to compare versions
 	  in a manner compatible with
-- 
2.38.5

Re: [PATCH] fixup! string: import strverscmp_improved from systemd

[Sascha Hauer]

On Fri, Jun 02, 2023 at 08:07:45PM +0200, Ahmad Fatoum wrote:
> lib: revert CONFIG_STMP_DEVICE prompt visibility
> 
> CONFIG_STMP_DEVICE is unrelated to the strverscmp changes and I touched
> it by mistake when I sought to remove VERSION_CMP's prompt. Fix this.
> 
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
>  lib/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/lib/Kconfig b/lib/Kconfig
> index 84d2a2573625..758197b60866 100644
> --- a/lib/Kconfig
> +++ b/lib/Kconfig
> @@ -107,7 +107,7 @@ config IMAGE_SPARSE
>  	bool
>  
>  config STMP_DEVICE
> -	bool "STMP device support"
> +	bool "STMP device support" if COMPILE_TEST
>  
>  config FSL_QE_FIRMWARE
>  	select CRC32
> @@ -168,7 +168,7 @@ config PROGRESS_NOTIFIER
>  	  progress, like blinking a LED during an update.
>  
>  config VERSION_CMP
> -	bool "version comparison utilities" if COMPILE_TEST
> +	bool
>  	help
>  	  This is selected by code that needs to compare versions
>  	  in a manner compatible with
> -- 
> 2.38.5
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |