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

[ptxdist] [PATCH v3] 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>
---
v3: add back the missing \1 and \) in the replacement…
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\>/\1GCONV_BASE/
-- 
2.39.2

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

[Michael Olbrich]

On Thu, Aug 03, 2023 at 02:28:09PM +0200, Roland Hieber wrote:
> Fixes: a5ff1ad3a24c700884a1 (2023-07-04, "glibc: fix typo GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> v3: add back the missing \1 and \) in the replacement…
> 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\>/\1GCONV_BASE/

Hmm, I don't think this is necessary. GLIBC_GCONV_BASE is a noprompt symbol
so it will be updated automatically during any migrate/oldconfig.

The migration helpers are for symbols that may be lost when they are
renamed.

Michael

> -- 
> 2.39.2
> 
> 
> 
> 
> 

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