CVS commit: [netbsd-11] src

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    src
Committed By:   martin
Date:           Thu Oct  8 18:56:27 UTC 2026

Modified Files:
        src/distrib/utils/embedded [netbsd-11]: mkimage
        src/etc [netbsd-11]: Makefile
        src/etc/etc.evbarm [netbsd-11]: Makefile.inc
        src/etc/etc.evbmips [netbsd-11]: Makefile.inc
        src/etc/etc.evbppc [netbsd-11]: Makefile.inc
        src/etc/etc.riscv [netbsd-11]: Makefile.inc

Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #511):

        etc/etc.riscv/Makefile.inc: revision 1.8
        etc/etc.evbarm/Makefile.inc: revision 1.140
        etc/etc.evbarm/Makefile.inc: revision 1.141
        etc/etc.evbarm/Makefile.inc: revision 1.142
        etc/etc.evbarm/Makefile.inc: revision 1.145
        etc/etc.evbppc/Makefile.inc: revision 1.23
        etc/etc.evbmips/Makefile.inc: revision 1.33
        etc/etc.evbarm/Makefile.inc: revision 1.139
        etc/Makefile: revision 1.478
        distrib/utils/embedded/mkimage: revision 1.98

Generate hashes for bootable images in gzimg directory.

At one point this should probably be unified at least a bit with the hash
generation of regular sets, so that there is a single place that defines
the types of hashes generated for sets and gzimg.

PR install/59195 and PR port-evbmips/60302: fix hashes in gzimg directories

Hashes in gzimg directories for some ports either correspond to the
wrong (i.e., uncompressed) files or do not cover all files.  These
problems are described in PR install/59195 and PR port-evbmips/60302,
respectively.  The potential solution offered for PR 59195 does not
work if multiple image files exist in a single gzimg directory.

The correct solution involves three aspects: (i) make checksums
independently of mkimage, which allows a common list of hashes in
etc/Makefile, (ii) for directories producing more than one compressed
image, make checksums in individual temporary files, one per
compressed image, to combine at the end, and (iii) add make targets to
allow parallelism across multiple images within each directory.

This patch implements those steps for the evbarm, evbmips, evbppc, and
riscv ports, which were the only ones previously using mkimage for
checksums.

Do not try to make image hashes if we created no images

Fix indent.

etc/etc.evbarm/Makefile.inc: follow-on hash generation fix

Revs. 141 & 142 introduced a guard that tried to prevent checksum
consolidation from running in contexts where there's nothing to process
-- that is, images aren't created at all. However, it then also
prevented clean builds that do include images from consolidating their
checksums as intended, since the "exists" check that was added reflects
too early a file system state on clean builds ("gzimg" doesn't exist
yet). It also didn't address the fact that there can be targets that
do in fact create and populate a "gzimg" directory, yet don't actually
generate any images as presently construed/defined are relevant for
hash generation, as happens with the evbearmv4-el arch.

Another fix for PR install/59195. Tested with earmv5hf (no images, no
"gzimg" directory created), evbearmv4-el (no images, "gzimg" directory
is created), and aarch64 (images and "gzimg" directory are created),
with clean builds into new directory structures and subsequent update
builds tested for each arch.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.92.2.1 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.475.2.2 -r1.475.2.3 src/etc/Makefile
cvs rdiff -u -r1.136 -r1.136.2.1 src/etc/etc.evbarm/Makefile.inc
cvs rdiff -u -r1.32 -r1.32.2.1 src/etc/etc.evbmips/Makefile.inc
cvs rdiff -u -r1.19.2.1 -r1.19.2.2 src/etc/etc.evbppc/Makefile.inc
cvs rdiff -u -r1.7 -r1.7.2.1 src/etc/etc.riscv/Makefile.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.