Module Name: src
Committed By: jmmv
Date: Sun Dec 29 09:46:45 UTC 2024
Modified Files:
src/distrib/utils/embedded: mkimage
src/distrib/utils/embedded/conf: evbarm.conf evbmips.conf evbppc.conf
x86.conf
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:
Recognize MKPOSTFIX=no in mkimage
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.43 -r1.44 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r1.5 -r1.6 src/distrib/utils/embedded/conf/evbmips.conf
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/embedded/conf/evbppc.conf
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/embedded/conf/x86.conf
cvs rdiff -u -r1.131 -r1.132 src/etc/etc.evbarm/Makefile.inc
cvs rdiff -u -r1.29 -r1.30 src/etc/etc.evbmips/Makefile.inc
cvs rdiff -u -r1.16 -r1.17 src/etc/etc.evbppc/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 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.86 src/distrib/utils/embedded/mkimage:1.87
--- src/distrib/utils/embedded/mkimage:1.86 Sat Dec 28 18:13:29 2024
+++ src/distrib/utils/embedded/mkimage Sun Dec 29 09:46:44 2024
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.86 2024/12/28 18:13:29 christos Exp $
+# $NetBSD: mkimage,v 1.87 2024/12/29 09:46:44 jmmv Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -61,6 +61,9 @@ INSTALLBOOT=${TOOL_INSTALLBOOT:-installb
MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE:-mkubootimage}
GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
+postfix=false
+[ "${MKPOSTFIX:-yes}" = no ] || postfix=true
+
src="/usr/src"
sets="base comp etc games gpufw man manhtml misc modules rescue tests text"
xsets="xbase xcomp xetc xfont xserver"
@@ -118,10 +121,14 @@ minwrites_fstab_entries() {
tmpfs /var/log tmpfs rw,union,-s32M
tmpfs /var/run tmpfs rw,union,-s1M
tmpfs /var/mail tmpfs rw,union,-s10M
+tmpfs /var/chroot tmpfs rw,union,-s10M
+EOF
+ if $postfix; then
+ cat << EOF
tmpfs /var/spool/postfix tmpfs rw,union,-s20M
tmpfs /var/db/postfix tmpfs rw,union,-s1M
-tmpfs /var/chroot tmpfs rw,union,-s10M
EOF
+ fi
}
make_fstab_gpt() {
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.43 src/distrib/utils/embedded/conf/evbarm.conf:1.44
--- src/distrib/utils/embedded/conf/evbarm.conf:1.43 Fri Dec 27 19:02:19 2024
+++ src/distrib/utils/embedded/conf/evbarm.conf Sun Dec 29 09:46:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.43 2024/12/27 19:02:19 christos Exp $
+# $NetBSD: evbarm.conf,v 1.44 2024/12/29 09:46:44 jmmv Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -70,7 +70,7 @@ make_fstab_evbarm() {
}
customize_evbarm() {
- if $minwrites; then
+ if $minwrites && $postfix; then
mkdir ${mnt}/etc/postfix
(umask 022
sed -e 's/fifo/unix/' < ${release}/etc/postfix/master.cf > \
Index: src/distrib/utils/embedded/conf/evbmips.conf
diff -u src/distrib/utils/embedded/conf/evbmips.conf:1.5 src/distrib/utils/embedded/conf/evbmips.conf:1.6
--- src/distrib/utils/embedded/conf/evbmips.conf:1.5 Fri Dec 27 19:02:19 2024
+++ src/distrib/utils/embedded/conf/evbmips.conf Sun Dec 29 09:46:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: evbmips.conf,v 1.5 2024/12/27 19:02:19 christos Exp $
+# $NetBSD: evbmips.conf,v 1.6 2024/12/29 09:46:44 jmmv Exp $
# evbmips shared config
#
image=$HOME/${board}.img
@@ -70,7 +70,7 @@ make_fstab_evbmips() {
}
customize_evbmips() {
- if $minwrites; then
+ if $minwrites && $postfix; then
mkdir ${mnt}/etc/postfix
(umask 022
sed -e 's/fifo/unix/' < ${release}/etc/postfix/master.cf > \
Index: src/distrib/utils/embedded/conf/evbppc.conf
diff -u src/distrib/utils/embedded/conf/evbppc.conf:1.2 src/distrib/utils/embedded/conf/evbppc.conf:1.3
--- src/distrib/utils/embedded/conf/evbppc.conf:1.2 Fri Dec 27 19:02:19 2024
+++ src/distrib/utils/embedded/conf/evbppc.conf Sun Dec 29 09:46:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: evbppc.conf,v 1.2 2024/12/27 19:02:19 christos Exp $ */
+# $NetBSD: evbppc.conf,v 1.3 2024/12/29 09:46:44 jmmv Exp $ */
# evbppc shared config
#
image=$HOME/${board}.img
@@ -70,7 +70,7 @@ make_fstab_evbppc() {
}
customize_evbppc() {
- if $minwrites; then
+ if $minwrites && $postfix; then
mkdir ${mnt}/etc/postfix
(umask 022
sed -e 's/fifo/unix/' < ${release}/etc/postfix/master.cf > \
Index: src/distrib/utils/embedded/conf/x86.conf
diff -u src/distrib/utils/embedded/conf/x86.conf:1.12 src/distrib/utils/embedded/conf/x86.conf:1.13
--- src/distrib/utils/embedded/conf/x86.conf:1.12 Fri Dec 27 19:02:19 2024
+++ src/distrib/utils/embedded/conf/x86.conf Sun Dec 29 09:46:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: x86.conf,v 1.12 2024/12/27 19:02:19 christos Exp $
+# $NetBSD: x86.conf,v 1.13 2024/12/29 09:46:44 jmmv Exp $
# x86 shared config
#
@@ -59,7 +59,7 @@ make_fstab() {
customize() {
cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
- if $minwrites; then
+ if $minwrites && $postfix; then
mkdir ${mnt}/etc/postfix
(umask 022
sed -e 's/fifo/unix/' < ${release}/etc/postfix/master.cf > \
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.131 src/etc/etc.evbarm/Makefile.inc:1.132
--- src/etc/etc.evbarm/Makefile.inc:1.131 Thu Nov 3 09:04:56 2022
+++ src/etc/etc.evbarm/Makefile.inc Sun Dec 29 09:46:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.131 2022/11/03 09:04:56 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.132 2024/12/29 09:46:44 jmmv Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -92,6 +92,7 @@ __mkimage: .USE
KERNOBJDIR=${KERNOBJDIR} \
MACHINE=${MACHINE} \
MKDTB=${MKDTB} \
+ MKPOSTFIX=${MKPOSTFIX} \
${HOST_SH} ${MKIMAGE} -x -h ${.TARGET:S/smp_//} -D ${DESTDIR} \
-S ${NETBSDSRCDIR} -B ${IMAGEENDIAN} ${MKI_OPTS.${.TARGET}} \
${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.29 src/etc/etc.evbmips/Makefile.inc:1.30
--- src/etc/etc.evbmips/Makefile.inc:1.29 Thu Jul 11 13:46:45 2024
+++ src/etc/etc.evbmips/Makefile.inc Sun Dec 29 09:46:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.29 2024/07/11 13:46:45 rin Exp $
+# $NetBSD: Makefile.inc,v 1.30 2024/12/29 09:46:44 jmmv Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -67,6 +67,7 @@ __mkimage: .USE
KERNOBJDIR=${KERNOBJDIR} \
MACHINE=${MACHINE} \
MKDTB=${MKDTB} \
+ MKPOSTFIX=${MKPOSTFIX} \
${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.16 src/etc/etc.evbppc/Makefile.inc:1.17
--- src/etc/etc.evbppc/Makefile.inc:1.16 Thu Oct 31 08:29:24 2024
+++ src/etc/etc.evbppc/Makefile.inc Sun Dec 29 09:46:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2024/10/31 08:29:24 jmcneill Exp $
+# $NetBSD: Makefile.inc,v 1.17 2024/12/29 09:46:44 jmmv Exp $
#
# etc.evbppc/Makefile.inc -- evbppc-specific etc Makefile targets
#
@@ -55,6 +55,7 @@ __mkimage: .USE
KERNOBJDIR=${KERNOBJDIR} \
MACHINE=${MACHINE} \
MKDTB=${MKDTB} \
+ MKPOSTFIX=${MKPOSTFIX} \
${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.4 src/etc/etc.riscv/Makefile.inc:1.5
--- src/etc/etc.riscv/Makefile.inc:1.4 Sun May 7 12:41:46 2023
+++ src/etc/etc.riscv/Makefile.inc Sun Dec 29 09:46:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2023/05/07 12:41:46 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.5 2024/12/29 09:46:44 jmmv Exp $
#
# etc.riscv/Makefile.inc -- riscv-specific etc Makefile targets
#
@@ -31,6 +31,7 @@ __mkimage: .USE
KERNOBJDIR=${KERNOBJDIR} \
MACHINE=${MACHINE} \
MKDTB=${MKDTB} \
+ MKPOSTFIX=${MKPOSTFIX} \
${HOST_SH} ${MKIMAGE} -h ${.TARGET:S/smp_//} -D ${DESTDIR} \
-S ${NETBSDSRCDIR} ${MKI_OPTS.${.TARGET}} \
${IMAGE.dir}/${.TARGET:S/smp_//}.img.gz
