From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 04 Aug 2023 08:25:37 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qRoFm-006kLN-Ko for lore@lore.pengutronix.de; Fri, 04 Aug 2023 08:25:37 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qRoFk-0001hw-6C; Fri, 04 Aug 2023 08:25:36 +0200 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qRoFI-0001gR-J6; Fri, 04 Aug 2023 08:25:08 +0200 Received: from mol by pty.hi.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qRoFI-00Bhbd-5L; Fri, 04 Aug 2023 08:25:08 +0200 Date: Fri, 4 Aug 2023 08:25:08 +0200 From: Michael Olbrich To: Roland Hieber Message-ID: Mail-Followup-To: Roland Hieber , ptxdist@pengutronix.de, Michael Tretter References: <20230803122809.7n67gpri2d4weygt@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230803122809.7n67gpri2d4weygt@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH v3] migrate_ptx: add typo fix GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de, Michael Tretter Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 > --- > 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 |