Module Name: src
Committed By: jmmv
Date: Sat Jan 11 14:33:32 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:
Inject TOOL_SED and TOOL_PWD_MKDB into mkimage
The configuration files used for mkimage might want to customize the passwd
database of the generated image (as is the case for an out-of-tree config
file I have) and passing in these tools helps to execute those modifications.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.133 -r1.134 src/etc/etc.evbarm/Makefile.inc
cvs rdiff -u -r1.30 -r1.31 src/etc/etc.evbmips/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/etc/etc.evbppc/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 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.87 src/distrib/utils/embedded/mkimage:1.88
--- src/distrib/utils/embedded/mkimage:1.87 Sun Dec 29 09:46:44 2024
+++ src/distrib/utils/embedded/mkimage Sat Jan 11 14:33:31 2025
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.87 2024/12/29 09:46:44 jmmv Exp $
+# $NetBSD: mkimage,v 1.88 2025/01/11 14:33:31 jmmv Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -60,6 +60,8 @@ MTREE=${TOOL_MTREE:-mtree}
INSTALLBOOT=${TOOL_INSTALLBOOT:-installboot}
MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE:-mkubootimage}
GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
+SED=${TOOL_SED:-sed}
+PWD_MKDB=${TOOL_PWD_MKDB:-pwd_mkdb}
postfix=false
[ "${MKPOSTFIX:-yes}" = no ] || postfix=true
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.133 src/etc/etc.evbarm/Makefile.inc:1.134
--- src/etc/etc.evbarm/Makefile.inc:1.133 Tue Dec 31 08:02:48 2024
+++ src/etc/etc.evbarm/Makefile.inc Sat Jan 11 14:33:31 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.133 2024/12/31 08:02:48 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.134 2025/01/11 14:33:31 jmmv Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -88,6 +88,8 @@ __mkimage: .USE
TOOL_PAX=${TOOL_PAX} \
TOOL_MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE} \
TOOL_MTREE=${TOOL_MTREE} \
+ TOOL_SED=${TOOL_SED} \
+ TOOL_PWD_MKDB=${TOOL_PWD_MKDB} \
HOST_SH=${HOST_SH} \
KERNOBJDIR=${KERNOBJDIR} \
MACHINE=${MACHINE} \
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.30 src/etc/etc.evbmips/Makefile.inc:1.31
--- src/etc/etc.evbmips/Makefile.inc:1.30 Sun Dec 29 09:46:44 2024
+++ src/etc/etc.evbmips/Makefile.inc Sat Jan 11 14:33:31 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.30 2024/12/29 09:46:44 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.31 2025/01/11 14:33:31 jmmv Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -63,6 +63,8 @@ __mkimage: .USE
TOOL_PAX=${TOOL_PAX} \
TOOL_MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE} \
TOOL_MTREE=${TOOL_MTREE} \
+ TOOL_SED=${TOOL_SED} \
+ TOOL_PWD_MKDB=${TOOL_PWD_MKDB} \
HOST_SH=${HOST_SH} \
KERNOBJDIR=${KERNOBJDIR} \
MACHINE=${MACHINE} \
Index: src/etc/etc.evbppc/Makefile.inc
diff -u src/etc/etc.evbppc/Makefile.inc:1.17 src/etc/etc.evbppc/Makefile.inc:1.18
--- src/etc/etc.evbppc/Makefile.inc:1.17 Sun Dec 29 09:46:44 2024
+++ src/etc/etc.evbppc/Makefile.inc Sat Jan 11 14:33:31 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2024/12/29 09:46:44 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.18 2025/01/11 14:33:31 jmmv Exp $
#
# etc.evbppc/Makefile.inc -- evbppc-specific etc Makefile targets
#
@@ -51,6 +51,8 @@ __mkimage: .USE
TOOL_PAX=${TOOL_PAX} \
TOOL_MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE} \
TOOL_MTREE=${TOOL_MTREE} \
+ TOOL_SED=${TOOL_SED} \
+ TOOL_PWD_MKDB=${TOOL_PWD_MKDB} \
HOST_SH=${HOST_SH} \
KERNOBJDIR=${KERNOBJDIR} \
MACHINE=${MACHINE} \
Index: src/etc/etc.riscv/Makefile.inc
diff -u src/etc/etc.riscv/Makefile.inc:1.5 src/etc/etc.riscv/Makefile.inc:1.6
--- src/etc/etc.riscv/Makefile.inc:1.5 Sun Dec 29 09:46:44 2024
+++ src/etc/etc.riscv/Makefile.inc Sat Jan 11 14:33:31 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2024/12/29 09:46:44 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.6 2025/01/11 14:33:31 jmmv Exp $
#
# etc.riscv/Makefile.inc -- riscv-specific etc Makefile targets
#
@@ -27,6 +27,8 @@ __mkimage: .USE
TOOL_MKNOD=${TOOL_MKNOD} \
TOOL_PAX=${TOOL_PAX} \
TOOL_MTREE=${TOOL_MTREE} \
+ TOOL_SED=${TOOL_SED} \
+ TOOL_PWD_MKDB=${TOOL_PWD_MKDB} \
HOST_SH=${HOST_SH} \
KERNOBJDIR=${KERNOBJDIR} \
MACHINE=${MACHINE} \
