Hello Jon,
On Thu, Aug 02, 2018 at 09:49:59PM -0400, [email protected] wrote:
> diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches
> index f2568f9..738a4ac 100755
> --- a/scripts/git-ptx-patches
> +++ b/scripts/git-ptx-patches
> @@ -2,11 +2,33 @@
>
> PTX_PATCHES_HEADER="# generated by git-ptx-patches"
>
> -function _md5sum() {
> - local sum=$(md5sum)
> +function _sha1sum() {
> + local sum=$(git rev-parse HEAD)
> echo "# $sum git-ptx-patches magic"
> }
>
> +update_series_md5() {
> + local makefile="$(readlink -f .ptxdist/rule.make)"
> + source .ptxdist/rule.env
> + set -- $(md5sum .ptxdist/series)
> + local md5="${1}"
Is this better than:
local md5="$(md5sum .ptxdist/series)"
?
If I understand this right, this catches updates to the patch series
that change the series but if I only amend a patch this goes unnoticed.
Given that md5 is considered weak today, maybe use something more modern
instead (e.g. sha256?).
> + local count=$(grep "^${PKG}_SERIES_MD5[ ]*:=" "${makefile}" 2>
> /dev/null | wc -l)
> + if [ "${count}" -gt 1 ]; then
> + echo "Error: Could not update patch series md5sum for
> '${pkg_label}': ${PKG}_SERIES_MD5 found ${count} times in '${makefile}'."
> + exit 1
> + fi
> + local current_md5=$(grep "^PUGIXML_SERIES_MD5[ ]*:= " ${makefile}
> |cut -f2 -d=|xargs)
PUGIXML?
> + if [ "${current_md5}" != "${md5}" ]; then
> + sed -i "s/^\(\<${PKG}_SERIES_MD5[ ]*:=\) *[a-f0-9]*\$/\1
> ${md5}/" "${makefile}"
> + if ! grep -q "${md5}\$" .ptxdist/rule.make; then
> + echo "Warning: ${PKG}_SERIES_MD5 is missing from
> '${makefile}'."
> + else
> + echo "New patch series checksum for '${pkg_label}':
> ${md5} in '${makefile}'."
> + fi
> + fi
> +}
> +
> if [ ! -L .ptxdist/patches ]; then
> echo "Error: This is not patched by ptxdist. Aborting."
> exit 1
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
_______________________________________________
ptxdist mailing list
[email protected]
