[ptxdist] [PATCH] glibc: fix typo GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE

[ptxdist] [PATCH] glibc: fix typo GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE

[Michael Tretter]

Fix the typo in the config item to fix the grep for GCONV.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/glibc.in   | 8 ++++----
 rules/glibc.make | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rules/glibc.in b/rules/glibc.in
index 345d59a306c8..2bcaa8893e64 100644
--- a/rules/glibc.in
+++ b/rules/glibc.in
@@ -258,13 +258,13 @@ config GLIBC_I18N_RAWDATA
 
 menu "Install gconv libraries       "
 
-config GLIBC_GCONF_BASE
+config GLIBC_GCONV_BASE
 	bool
 
 config GLIBC_GCONV_DEF
 	bool
 	prompt "default gconv modules"
-	select GLIBC_GCONF_BASE
+	select GLIBC_GCONV_BASE
 	default y
 	help
 	  install the iso8859-1 (Latin Alphabet No.1) and the iso8859-15 (Latin
@@ -274,14 +274,14 @@ config GLIBC_GCONV_DEF
 config GLIBC_GCONV_UTF
 	bool
 	prompt "gconv modules for UTF"
-	select GLIBC_GCONF_BASE
+	select GLIBC_GCONV_BASE
 	help
 	  install the gconv modules for UTF conversion
 
 config GLIBC_GCONV_ZH
 	bool
 	prompt "gconv modules for chinese language"
-	select GLIBC_GCONF_BASE
+	select GLIBC_GCONV_BASE
 	help
 	  install the gconv modules for chinese language, including BIG5
 	  and GB18030
diff --git a/rules/glibc.make b/rules/glibc.make
index a550f4b9206a..f42901193a83 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -128,7 +128,7 @@ ifdef PTXCONF_GLIBC_NSL
 	@$(call install_copy_toolchain_lib, glibc, libnsl.so.1)
 endif
 
-ifdef PTXCONF_GLIBC_GCONF_BASE
+ifdef PTXCONF_GLIBC_GCONV_BASE
 	@$(call install_copy_toolchain_lib, glibc, gconv/gconv-modules,, n)
 endif
 
-- 
2.39.2

Re: [ptxdist] [APPLIED] glibc: fix typo GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE

[Michael Olbrich]

Thanks, applied as a5ff1ad3a24c700884a184feb0d65c2f56987cc2.

Michael

[sent from post-receive hook]

On Sat, 08 Jul 2023 09:02:55 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> Fix the typo in the config item to fix the grep for GCONV.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20230704071832.3360626-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/glibc.in b/rules/glibc.in
> index 345d59a306c8..2bcaa8893e64 100644
> --- a/rules/glibc.in
> +++ b/rules/glibc.in
> @@ -258,13 +258,13 @@ config GLIBC_I18N_RAWDATA
>  
>  menu "Install gconv libraries       "
>  
> -config GLIBC_GCONF_BASE
> +config GLIBC_GCONV_BASE
>  	bool
>  
>  config GLIBC_GCONV_DEF
>  	bool
>  	prompt "default gconv modules"
> -	select GLIBC_GCONF_BASE
> +	select GLIBC_GCONV_BASE
>  	default y
>  	help
>  	  install the iso8859-1 (Latin Alphabet No.1) and the iso8859-15 (Latin
> @@ -274,14 +274,14 @@ config GLIBC_GCONV_DEF
>  config GLIBC_GCONV_UTF
>  	bool
>  	prompt "gconv modules for UTF"
> -	select GLIBC_GCONF_BASE
> +	select GLIBC_GCONV_BASE
>  	help
>  	  install the gconv modules for UTF conversion
>  
>  config GLIBC_GCONV_ZH
>  	bool
>  	prompt "gconv modules for chinese language"
> -	select GLIBC_GCONF_BASE
> +	select GLIBC_GCONV_BASE
>  	help
>  	  install the gconv modules for chinese language, including BIG5
>  	  and GB18030
> diff --git a/rules/glibc.make b/rules/glibc.make
> index e3b3574ccf0b..2dd74a70fe80 100644
> --- a/rules/glibc.make
> +++ b/rules/glibc.make
> @@ -128,7 +128,7 @@ ifdef PTXCONF_GLIBC_NSL
>  	@$(call install_copy_toolchain_lib, glibc, libnsl.so.1)
>  endif
>  
> -ifdef PTXCONF_GLIBC_GCONF_BASE
> +ifdef PTXCONF_GLIBC_GCONV_BASE
>  	@$(call install_copy_toolchain_lib, glibc, gconv/gconv-modules,, n)
>  endif
>  

[ptxdist] [PATCH] migrate_ptx: add typo fix GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE

[Roland Hieber]

Fixes: a5ff1ad3a24c700884a1 (2023-07-04, "glibc: fix typo GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
Would something like this make sense so it gets renamed automatically on
how ptxdist migrate"?

  - Roland

 scripts/migrate/migrate_ptx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 7f8c09e06a0b..9da48c38b1dd 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -460,3 +460,10 @@ s/^\(\(# \)\?PTXCONF_LIGHTTPD_MOD_\)COMPRESS\>/\1DEFLATE/
 # reason : upstream util-linux-ng fork was renamed back to util-linux over a decade ago
 #
 s/^\(\(# \)\?PTXCONF_UTIL_LINUX\)_NG/\1/
+
+# from   : ptxdist-2023.06.0
+# to     : ptxdist-2023.07.0
+# symbol : GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE
+# reason : fix typo in kconfig option
+#
+s/^\(\(# \)\?PTXCONF_GLIBC_GCONF_BASE\>/PTXCONF_GLIBC_GCONV_BASE/
-- 
2.39.2

[ptxdist] [PATCH v2] migrate_ptx: add typo fix GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE

[Roland Hieber]

Fixes: a5ff1ad3a24c700884a1 (2023-07-04, "glibc: fix typo GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2: fix from/to versions, the commit was not released yet…

 scripts/migrate/migrate_ptx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 7f8c09e06a0b..6326b320cb0b 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -460,3 +460,10 @@ s/^\(\(# \)\?PTXCONF_LIGHTTPD_MOD_\)COMPRESS\>/\1DEFLATE/
 # reason : upstream util-linux-ng fork was renamed back to util-linux over a decade ago
 #
 s/^\(\(# \)\?PTXCONF_UTIL_LINUX\)_NG/\1/
+
+# from   : ptxdist-2023.07.0
+# to     : ptxdist-2023.08.0
+# symbol : GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE
+# reason : fix typo in kconfig option
+#
+s/^\(\(# \)\?PTXCONF_GLIBC_GCONF_BASE\>/PTXCONF_GLIBC_GCONV_BASE/
-- 
2.39.2