From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 18 May 2026 09:56:28 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wOspw-0013cx-0c for lore@lore.pengutronix.de; Mon, 18 May 2026 09:56:28 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wOspv-0003tW-PC; Mon, 18 May 2026 09:56:27 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wOsns-0004mB-Fp; Mon, 18 May 2026 09:54:20 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wOsnr-000YUG-2h; Mon, 18 May 2026 09:54:20 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1wOsns-00000000Dli-1SDT; Mon, 18 May 2026 09:54:20 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 18 May 2026 09:54:20 +0200 Message-ID: <20260518075420.52919-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260427142848.989702-2-p.zabel@pengutronix.de> References: <20260427142848.989702-2-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] scripts: make checksum messages hash algorithm agnostic 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: Philipp Zabel 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 7ed86f68f18fd295502c2ce53b92cb4e5e640a1f. Michael [sent from post-receive hook] On Mon, 18 May 2026 09:54:20 +0200, Philipp Zabel wrote: > Replace 'md5sum' with the generic term 'checksum' in messages presented > to the user, in preparation for supporting other checksum algorithms. > > Signed-off-by: Philipp Zabel > Message-Id: <20260427142848.989702-2-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/scripts/lib/ptxd_make_check_src.sh b/scripts/lib/ptxd_make_check_src.sh > index db08cda0e1fe..2a25fdcb96cf 100644 > --- a/scripts/lib/ptxd_make_check_src.sh > +++ b/scripts/lib/ptxd_make_check_src.sh > @@ -52,9 +52,9 @@ ptxd_make_check_src() { > ptxd_make_check_src_impl "$@" && return > > if [ -z "${2}" ]; then > - ptxd_bailout "md5sum for '${1}' missing." > + ptxd_bailout "Checksum for '${1}' missing." > else > - ptxd_bailout "Wrong md5sum for '${1}'" > + ptxd_bailout "Wrong checksum for '${1}'" > fi > } > export -f ptxd_make_check_src > diff --git a/scripts/lib/ptxd_make_world_check_src.sh b/scripts/lib/ptxd_make_world_check_src.sh > index 39e49b274a24..8aaeb1137152 100644 > --- a/scripts/lib/ptxd_make_world_check_src.sh > +++ b/scripts/lib/ptxd_make_world_check_src.sh > @@ -38,15 +38,15 @@ ptxd_make_world_update_md5() { > fi > done > if [ -z "${pkg_makefile}" ]; then > - ptxd_bailout "Could not update md5sum for '${pkg_label}': makefile not found" > + ptxd_bailout "Could not update checksum for '${pkg_label}': makefile not found" > fi > local count=$(grep "^${pkg_PKG}_MD5[ ]*:=" "${pkg_makefile}" 2> /dev/null | wc -l) > if [ "${count}" -gt 1 ]; then > - ptxd_bailout "Could not update md5sum for '${pkg_label}': ${pkg_PKG}_MD5 found ${count} times in '$(ptxd_print_path ${pkg_makefile})'." > + ptxd_bailout "Could not update checksum for '${pkg_label}': ${pkg_PKG}_MD5 found ${count} times in '$(ptxd_print_path ${pkg_makefile})'." > fi > sed -i "s/^\(\<${pkg_PKG}_MD5[ ]*:=\) *[a-f0-9]*\$/\1 ${md5}/" "${pkg_makefile}" > if ! grep -q "${md5}\$" "${pkg_makefile}"; then > - ptxd_bailout "Could not update md5sum for '${pkg_label}': ${pkg_PKG}_MD5 not found" > + ptxd_bailout "Could not update checksum for '${pkg_label}': ${pkg_PKG}_MD5 not found" > fi > ptxd_warning "New checksum for ${pkg_PKG}: ${md5} in $(ptxd_print_path "${pkg_makefile}")" > } > diff --git a/scripts/lib/ptxd_make_world_get.sh b/scripts/lib/ptxd_make_world_get.sh > index c2c4facae092..8c0bb0546150 100644 > --- a/scripts/lib/ptxd_make_world_get.sh > +++ b/scripts/lib/ptxd_make_world_get.sh > @@ -27,9 +27,9 @@ ptxd_make_world_get() { > if [ "${PTXCONF_SETUP_CHECK}" = "update" ]; then > ptxd_make_world_update_md5 > elif [ -z "${pkg_md5}" ]; then > - ptxd_bailout "md5sum for '${pkg_label}' (${pkg_src}) missing." > + ptxd_bailout "Checksum for '${pkg_label}' (${pkg_src}) missing." > else > - ptxd_bailout "Wrong md5sum for '${pkg_label}' (${pkg_src})" > + ptxd_bailout "Wrong checksum for '${pkg_label}' (${pkg_src})" > fi > fi > }