Module Name: src
Committed By: hgutch
Date: Sat Mar 22 09:25:14 UTC 2025
Modified Files:
src/distrib/utils/embedded: mkimage
src/etc/etc.evbarm: Makefile.inc
src/etc/etc.evbmips: Makefile.inc
src/etc/etc.evbppc: Makefile.inc
src/etc/etc.riscv: Makefile.inc
Log Message:
Also generate hashes for files in gzimg directories.
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.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.135 -r1.136 src/etc/etc.evbarm/Makefile.inc
cvs rdiff -u -r1.31 -r1.32 src/etc/etc.evbmips/Makefile.inc
cvs rdiff -u -r1.18 -r1.19 src/etc/etc.evbppc/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 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.
Modified files:
Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.90 src/distrib/utils/embedded/mkimage:1.91
--- src/distrib/utils/embedded/mkimage:1.90 Fri Jan 24 21:47:51 2025
+++ src/distrib/utils/embedded/mkimage Sat Mar 22 09:25:14 2025
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.90 2025/01/24 21:47:51 jmcneill Exp $
+# $NetBSD: mkimage,v 1.91 2025/03/22 09:25:14 hgutch Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -415,4 +415,8 @@ if $compress; then
image="${image}.gz"
fi
+cd "${IMAGEDIR}"
+${CKSUM} -a MD5 "$(basename "${image}")" > MD5
+${CKSUM} -a SHA512 "$(basename "${image}")" > SHA512
+
echo ${bar} Image is ${image} ${bar}
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.135 src/etc/etc.evbarm/Makefile.inc:1.136
--- src/etc/etc.evbarm/Makefile.inc:1.135 Sun Jan 12 02:55:23 2025
+++ src/etc/etc.evbarm/Makefile.inc Sat Mar 22 09:25:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.135 2025/01/12 02:55:23 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.136 2025/03/22 09:25:14 hgutch Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -95,6 +95,8 @@ __mkimage: .USE
MACHINE=${MACHINE} \
MKDTB=${MKDTB} \
MKPOSTFIX=${MKPOSTFIX} \
+ CKSUM=${CKSUM} \
+ IMAGEDIR=${IMAGE.dir} \
${HOST_SH} ${MKIMAGE} -h ${.TARGET:S/smp_//} -D ${DESTDIR} \
-S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \
${IMAGE.dir}/${.TARGET:S/smp_//}.img
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.31 src/etc/etc.evbmips/Makefile.inc:1.32
--- src/etc/etc.evbmips/Makefile.inc:1.31 Sat Jan 11 14:33:31 2025
+++ src/etc/etc.evbmips/Makefile.inc Sat Mar 22 09:25:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.31 2025/01/11 14:33:31 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.32 2025/03/22 09:25:14 hgutch Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -70,6 +70,8 @@ __mkimage: .USE
MACHINE=${MACHINE} \
MKDTB=${MKDTB} \
MKPOSTFIX=${MKPOSTFIX} \
+ CKSUM=${CKSUM} \
+ IMAGEDIR=${IMAGE.dir} \
${HOST_SH} ${MKIMAGE} -h ${.TARGET:S/smp_//} -D ${DESTDIR} \
-S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \
${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
Index: src/etc/etc.evbppc/Makefile.inc
diff -u src/etc/etc.evbppc/Makefile.inc:1.18 src/etc/etc.evbppc/Makefile.inc:1.19
--- src/etc/etc.evbppc/Makefile.inc:1.18 Sat Jan 11 14:33:31 2025
+++ src/etc/etc.evbppc/Makefile.inc Sat Mar 22 09:25:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2025/01/11 14:33:31 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.19 2025/03/22 09:25:14 hgutch Exp $
#
# etc.evbppc/Makefile.inc -- evbppc-specific etc Makefile targets
#
@@ -58,6 +58,8 @@ __mkimage: .USE
MACHINE=${MACHINE} \
MKDTB=${MKDTB} \
MKPOSTFIX=${MKPOSTFIX} \
+ CKSUM=${CKSUM} \
+ IMAGEDIR=${IMAGE.dir} \
${HOST_SH} -x ${MKIMAGE} -h ${.TARGET:S/smp_//} -D ${DESTDIR} \
-S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \
${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
Index: src/etc/etc.riscv/Makefile.inc
diff -u src/etc/etc.riscv/Makefile.inc:1.6 src/etc/etc.riscv/Makefile.inc:1.7
--- src/etc/etc.riscv/Makefile.inc:1.6 Sat Jan 11 14:33:31 2025
+++ src/etc/etc.riscv/Makefile.inc Sat Mar 22 09:25:14 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2025/01/11 14:33:31 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.7 2025/03/22 09:25:14 hgutch Exp $
#
# etc.riscv/Makefile.inc -- riscv-specific etc Makefile targets
#
@@ -34,6 +34,8 @@ __mkimage: .USE
MACHINE=${MACHINE} \
MKDTB=${MKDTB} \
MKPOSTFIX=${MKPOSTFIX} \
+ CKSUM=${CKSUM} \
+ IMAGEDIR=${IMAGE.dir} \
${HOST_SH} ${MKIMAGE} -h ${.TARGET:S/smp_//} -D ${DESTDIR} \
-S ${NETBSDSRCDIR} ${MKI_OPTS.${.TARGET}} \
${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
