From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 18 May 2026 09:56:30 +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 1wOspy-0013dI-2K for lore@lore.pengutronix.de; Mon, 18 May 2026 09:56:30 +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 1wOspy-00043U-Df; Mon, 18 May 2026 09:56:30 +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 1wOsnt-0004q2-Aa; Mon, 18 May 2026 09:54:21 +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 1wOsns-000YUq-2B; Mon, 18 May 2026 09:54:21 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1wOsnt-00000000DnE-0npn; Mon, 18 May 2026 09:54:21 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 18 May 2026 09:54:21 +0200 Message-ID: <20260518075421.53013-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260427142848.989702-3-p.zabel@pengutronix.de> References: <20260427142848.989702-3-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] scripts: make checksum update 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 da495a88188efd1990b9c106165606a907c080fa. Michael [sent from post-receive hook] On Mon, 18 May 2026 09:54:21 +0200, Philipp Zabel wrote: > Rename ptxd_make_world_update_md5() to ptxd_make_world_update_checksum() > and pass in the checksum tool (md5sum) and the hash suffix (MD5) as > parameters. > Rename local variables md5 to checksum and PKG_MD5 to PKG_SUM. > > Add back ptxd_make_world_update_md5() as a wrapper that calls > ptx_make_world_update_checksum md5sum MD5. > > No functional change. > > Signed-off-by: Philipp Zabel > Message-Id: <20260427142848.989702-3-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/scripts/lib/ptxd_make_world_check_src.sh b/scripts/lib/ptxd_make_world_check_src.sh > index 8aaeb1137152..044b1872fd0c 100644 > --- a/scripts/lib/ptxd_make_world_check_src.sh > +++ b/scripts/lib/ptxd_make_world_check_src.sh > @@ -8,26 +8,28 @@ > > > # > -# try to update the md5sum of the current package > -# this only works if the makefile contains a "_MD5 := ..." line. > +# $1: checksum tool, e.g. md5sum > +# $2: hash type suffix appended to _, e.g. MD5 > # > -ptxd_make_world_update_md5() { > +ptxd_make_world_update_checksum() { > + local tool="${1}" > + local SUFFIX="${2}" > local config file_dotconfig > - set -- $(md5sum "${pkg_src}") > - local md5="${1}" > + set -- $("${tool}" "${pkg_src}") > + local checksum="${1}" > > - local PKG_MD5="PTXCONF_${pkg_PKG}_MD5" > + local PKG_SUM="PTXCONF_${pkg_PKG}_${SUFFIX}" > for config in "${PTXDIST_PLATFORMCONFIG}" "${PTXDIST_PTXCONFIG}"; do > file_dotconfig="${config}" > ptxd_normalize_config > - if grep -q "^${PKG_MD5}=\"" "${file_dotconfig}"; then > - sed -i "s/^${PKG_MD5}=\".*$/${PKG_MD5}=\"${md5}\"/" "${file_dotconfig}" > - ptxd_warning "New checksum for ${pkg_PKG}: ${md5} in $(ptxd_print_path "${file_dotconfig}")" > + if grep -q "^${PKG_SUM}=\"" "${file_dotconfig}"; then > + sed -i "s/^${PKG_SUM}=\".*$/${PKG_SUM}=\"${checksum}\"/" "${file_dotconfig}" > + ptxd_warning "New checksum for ${pkg_PKG}: ${checksum} in $(ptxd_print_path "${file_dotconfig}")" > if [ -e "${file_dotconfig}.diff" ]; then > - if grep -q "^${PKG_MD5}=\"" "${file_dotconfig}.diff"; then > - sed -i "s/^${PKG_MD5}=\".*$/${PKG_MD5}=\"${md5}\"/" "${file_dotconfig}.diff" > + if grep -q "^${PKG_SUM}=\"" "${file_dotconfig}.diff"; then > + sed -i "s/^${PKG_SUM}=\".*$/${PKG_SUM}=\"${checksum}\"/" "${file_dotconfig}.diff" > else > - echo "${PKG_MD5}=\"${md5}\"" >> "${file_dotconfig}.diff" > + echo "${PKG_SUM}=\"${checksum}\"" >> "${file_dotconfig}.diff" > if [ "${config}" == "${PTXDIST_PLATFORMCONFIG}" ]; then > arg=" platform" > fi > @@ -40,14 +42,21 @@ ptxd_make_world_update_md5() { > if [ -z "${pkg_makefile}" ]; then > 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) > + local count=$(grep "^${pkg_PKG}_${SUFFIX}[ ]*:=" "${pkg_makefile}" 2> /dev/null | wc -l) > if [ "${count}" -gt 1 ]; then > - ptxd_bailout "Could not update checksum 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}_${SUFFIX} 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 checksum for '${pkg_label}': ${pkg_PKG}_MD5 not found" > + sed -i "s/^\(\<${pkg_PKG}_${SUFFIX}[ ]*:=\) *[a-f0-9]*\$/\1 ${checksum}/" "${pkg_makefile}" > + if ! grep -q "${checksum}\$" "${pkg_makefile}"; then > + ptxd_bailout "Could not update checksum for '${pkg_label}': ${pkg_PKG}_${SUFFIX} not found" > fi > - ptxd_warning "New checksum for ${pkg_PKG}: ${md5} in $(ptxd_print_path "${pkg_makefile}")" > + ptxd_warning "New checksum for ${pkg_PKG}: ${checksum} in $(ptxd_print_path "${pkg_makefile}")" > +} > +export -f ptxd_make_world_update_checksum > + > +# try to update the md5sum of the current package > +# this only works if the makefile contains a "_MD5 := ..." line. > +ptxd_make_world_update_md5() { > + ptxd_make_world_update_checksum md5sum MD5 > } > export -f ptxd_make_world_update_md5