[src/trunk]: src/distrib Use symbol MTREECONF instead of MTREE to refer confi...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/distrib Use symbol MTREECONF instead of MTREE to refer confi...
From: enami <enami%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 09:50:10 +0000
details:   https://anonhg.NetBSD.org/src/rev/843de5dfedd6
branches:  trunk
changeset: 515944:843de5dfedd6
user:      enami <enami%NetBSD.org@localhost>
date:      Wed Oct 10 05:13:51 2001 +0000

description:
Use symbol MTREECONF instead of MTREE to refer configuration file
to avoid conflicts.  Pointed out by chs%netbsd.org@localhost.

diffstat:

 distrib/alpha/instkernel/ramdisk/Makefile          |  6 +++---
 distrib/amiga/floppies/inst-common/Makefile.inc    |  6 +++---
 distrib/arm32/floppies/inst-common/Makefile.inc    |  6 +++---
 distrib/arm32/ramdisk/Makefile                     |  6 +++---
 distrib/bebox/floppies/ramdisk/Makefile            |  6 +++---
 distrib/bebox/floppies/ramdisk/Makefile.inc        |  6 +++---
 distrib/i386/floppies/ramdisk-big/Makefile         |  8 ++++----
 distrib/i386/floppies/ramdisk-rescuesmall/Makefile |  8 ++++----
 distrib/i386/floppies/ramdisk-rescuetiny/Makefile  |  8 ++++----
 distrib/i386/floppies/ramdisk-small/Makefile       |  8 ++++----
 distrib/i386/floppies/ramdisk-tiny/Makefile        |  8 ++++----
 distrib/i386/floppies/ramdisk-tiny/Makefile.inc    |  6 +++---
 distrib/mac68k/instkernel/ramdisk/Makefile         |  6 +++---
 distrib/macppc/floppies/ramdisk/Makefile           |  6 +++---
 distrib/miniroot/Makefile                          |  6 +++---
 distrib/mipsco/ramdisk/Makefile                    |  6 +++---
 distrib/news68k/floppies/ramdisk/Makefile          |  6 +++---
 distrib/newsmips/floppies/ramdisk/Makefile         |  6 +++---
 distrib/pc532/floppies/inst-common/Makefile.inc    |  6 +++---
 distrib/pmax/ramdisk/Makefile                      |  6 +++---
 distrib/prep/floppies/ramdisk/Makefile             |  8 ++++----
 distrib/sparc/ramdisk/Makefile                     |  6 +++---
 distrib/sparc64/xminiroot/Makefile                 |  8 ++++----
 distrib/vax/inst-common/Makefile.inc               |  6 +++---
 distrib/vax/ramdisk/Makefile                       |  6 +++---
 distrib/vax/ramdisk/Makefile.inc                   |  6 +++---
 distrib/x68k/floppies/ramdisk-common/Makefile.inc  |  8 ++++----
 27 files changed, 89 insertions(+), 89 deletions(-)

diffs (truncated from 796 to 300 lines):

diff -r b864b18b5625 -r 843de5dfedd6 distrib/alpha/instkernel/ramdisk/Makefile
--- a/distrib/alpha/instkernel/ramdisk/Makefile Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/alpha/instkernel/ramdisk/Makefile Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2000/11/01 07:57:55 garbled Exp $
+#      $NetBSD: Makefile,v 1.11 2001/10/10 05:13:51 enami Exp $
 
 TOP=           ${.CURDIR}/..
 
@@ -19,7 +19,7 @@
 
 LISTS=         list
 CRUNCHCONF=    ${CBIN}.conf
-MTREE=         mtree.conf
+MTREECONF=     mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -29,7 +29,7 @@
 #      disklabel -rw ${VND_CDEV} ${DISKTYPE}
        newfs -B le -m 0 -o space -i 5120 -c 20 ${VND_RDEV}
        mount ${VND_DEV} ${MOUNT_POINT}
-       mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
+       mtree -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -u
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
            KERNOBJDIR=${KERNOBJDIR} \
            TARGDIR=${MOUNT_POINT} sh ${TOP}/src/runlist.sh ${.CURDIR}/${LISTS}
diff -r b864b18b5625 -r 843de5dfedd6 distrib/amiga/floppies/inst-common/Makefile.inc
--- a/distrib/amiga/floppies/inst-common/Makefile.inc   Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/amiga/floppies/inst-common/Makefile.inc   Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.17 2000/11/01 07:57:56 garbled Exp $
+#      $NetBSD: Makefile.inc,v 1.18 2001/10/10 05:13:51 enami Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -14,7 +14,7 @@
 
 LISTS=         ${COMMONDIR}/list ${.CURDIR}/list
 CRUNCHCONF=    ${COMMONDIR}/${CBIN}.conf
-MTREE=         ${COMMONDIR}/mtree.conf
+MTREECONF=     ${COMMONDIR}/mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -26,7 +26,7 @@
        installboot ${MDEC}/xxboot ${VND_RDEV}
        newfs -B be -c 64 -m 0 -o space ${VND_RDEV} ${DISKTYPE}
        mount -t ffs ${VND_DEV} ${MOUNT_POINT}
-       mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
+       mtree -def ${MTREECONF} -p ${MOUNT_POINT}/ -u
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
            KERNOBJDIR=${KERNOBJDIR} \
            TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
diff -r b864b18b5625 -r 843de5dfedd6 distrib/arm32/floppies/inst-common/Makefile.inc
--- a/distrib/arm32/floppies/inst-common/Makefile.inc   Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/arm32/floppies/inst-common/Makefile.inc   Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2000/12/14 23:48:16 jhawk Exp $
+# $NetBSD: Makefile.inc,v 1.11 2001/10/10 05:13:51 enami Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -14,7 +14,7 @@
 
 LISTS=         ${COMMONDIR}/list ${.CURDIR}/list
 CRUNCHCONF=    ${COMMONDIR}/${CBIN}.conf
-MTREE=         ${COMMONDIR}/mtree.conf
+MTREECONF=     ${COMMONDIR}/mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -25,7 +25,7 @@
        vnconfig -t ${DISKTYPE} -v -c ${VND_DEV} ${IMAGE}
        newfs -B le -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} ${DISKTYPE}
        mount ${VND_DEV} ${MOUNT_POINT}
-       mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
+       mtree -def ${MTREECONF} -p ${MOUNT_POINT}/ -u
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
            KERNOBJDIR=${KERNOBJDIR} \
            TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
diff -r b864b18b5625 -r 843de5dfedd6 distrib/arm32/ramdisk/Makefile
--- a/distrib/arm32/ramdisk/Makefile    Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/arm32/ramdisk/Makefile    Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2000/11/12 00:54:58 matt Exp $
+#      $NetBSD: Makefile,v 1.16 2001/10/10 05:13:52 enami Exp $
 
 TOP=           ${.CURDIR}/..
 
@@ -21,7 +21,7 @@
 
 LISTS=         list
 CRUNCHCONF=    ${CBIN}.conf
-MTREE=         mtree.conf
+MTREECONF=     mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -43,7 +43,7 @@
        disklabel -rw ${VND_CRDEV} ${DISKTYPE}
        newfs -B le -m 0 -o space -i 5120 -c 100 ${VND_RDEV}
        mount ${VND_DEV} ${MOUNT_POINT}
-       mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
+       mtree -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -u
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
            KERNOBJDIR=${KERNOBJDIR} \
            TARGDIR=${MOUNT_POINT} sh ${.CURDIR}/runlist.sh ${.CURDIR}/${LISTS}
diff -r b864b18b5625 -r 843de5dfedd6 distrib/bebox/floppies/ramdisk/Makefile
--- a/distrib/bebox/floppies/ramdisk/Makefile   Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/bebox/floppies/ramdisk/Makefile   Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2000/11/01 07:57:57 garbled Exp $
+#      $NetBSD: Makefile,v 1.7 2001/10/10 05:13:52 enami Exp $
 
 TOP=           ${.CURDIR}/..
 
@@ -22,7 +22,7 @@
 
 LISTS=         list
 CRUNCHCONF=    ${CBIN}.conf
-MTREE=         mtree.conf
+MTREECONF=     mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -43,7 +43,7 @@
        disklabel -rw ${VND_CDEV} ${DISKTYPE}
        newfs -B be -m 0 -o space -i 5120 -c 80 ${VND_RDEV} ${DISKTYPE}
        mount ${VND_DEV} ${MOUNT_POINT}
-       mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
+       mtree -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -u
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
            KERNOBJDIR=${KERNOBJDIR} \
            TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
diff -r b864b18b5625 -r 843de5dfedd6 distrib/bebox/floppies/ramdisk/Makefile.inc
--- a/distrib/bebox/floppies/ramdisk/Makefile.inc       Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/bebox/floppies/ramdisk/Makefile.inc       Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 2000/11/01 07:57:57 garbled Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2001/10/10 05:13:52 enami Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -16,7 +16,7 @@
 
 LISTS=         ${COMMONDIR}/list ${.CURDIR}/list
 CRUNCHCONF=    ${COMMONDIR}/${CBIN}.conf
-MTREE=         ${COMMONDIR}/mtree.conf
+MTREECONF=     ${COMMONDIR}/mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -28,7 +28,7 @@
        disklabel -rw ${VND_CDEV} ${DISKTYPE}
        newfs -B be -m 0 -o space -i 5120 -c 80 ${VND_RDEV} ${DISKTYPE}
        mount ${VND_DEV} ${MOUNT_POINT}
-       mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
+       mtree -def ${MTREECONF} -p ${MOUNT_POINT}/ -u
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
            KERNOBJDIR=${KERNOBJDIR} \
            TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
diff -r b864b18b5625 -r 843de5dfedd6 distrib/i386/floppies/ramdisk-big/Makefile
--- a/distrib/i386/floppies/ramdisk-big/Makefile        Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/i386/floppies/ramdisk-big/Makefile        Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2001/10/05 01:19:42 jmc Exp $
+#      $NetBSD: Makefile,v 1.8 2001/10/10 05:13:52 enami Exp $
 
 TOP=           ${.CURDIR}/..
 WARNS=1
@@ -23,7 +23,7 @@
 
 LISTS=         list
 CRUNCHCONF=    ${CBIN}.conf
-MTREE=         mtree.conf
+MTREECONF=     mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -34,7 +34,7 @@
 
 realall: ${IMAGE}
 
-${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
+${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
        rm -f ${IMAGE}.tmp
        dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
        vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp \
@@ -43,7 +43,7 @@
        disklabel -r -R ${VND_CDEV} tmplabel
        newfs -B le -m 0 -o space -i 3950 -c 80 ${VND_RDEV} 
        mount ${VND_DEV} ${MOUNT_POINT}
-       mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -U
+       mtree -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -U
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
            TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
        @echo ""
diff -r b864b18b5625 -r 843de5dfedd6 distrib/i386/floppies/ramdisk-rescuesmall/Makefile
--- a/distrib/i386/floppies/ramdisk-rescuesmall/Makefile        Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/i386/floppies/ramdisk-rescuesmall/Makefile        Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2001/10/05 01:19:43 jmc Exp $
+#      $NetBSD: Makefile,v 1.11 2001/10/10 05:13:52 enami Exp $
 
 TOP=           ${.CURDIR}/..
 WARNS=1
@@ -22,7 +22,7 @@
 
 LISTS=         list
 CRUNCHCONF=    ${CBIN}.conf
-MTREE=         mtree.conf
+MTREECONF=     mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -33,7 +33,7 @@
 
 realall: ${IMAGE}
 
-${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
+${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
        rm -f ${IMAGE}.tmp
        dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
        vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
@@ -41,7 +41,7 @@
        disklabel -r -R ${VND_CDEV} tmplabel
        newfs -B le -m 0 -o space -i 8192 -c 80 ${VND_RDEV} 
        mount ${VND_DEV} ${MOUNT_POINT}
-       mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -U
+       mtree -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -U
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
            TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
        @echo ""
diff -r b864b18b5625 -r 843de5dfedd6 distrib/i386/floppies/ramdisk-rescuetiny/Makefile
--- a/distrib/i386/floppies/ramdisk-rescuetiny/Makefile Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/i386/floppies/ramdisk-rescuetiny/Makefile Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2001/10/05 01:19:43 jmc Exp $
+#      $NetBSD: Makefile,v 1.10 2001/10/10 05:13:53 enami Exp $
 
 TOP=           ${.CURDIR}/..
 WARNS=1
@@ -22,7 +22,7 @@
 
 LISTS=         list
 CRUNCHCONF=    ${CBIN}.conf
-MTREE=         mtree.conf
+MTREECONF=     mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -33,7 +33,7 @@
 
 realall: ${IMAGE}
 
-${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
+${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
        rm -f ${IMAGE}.tmp
        dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
        vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
@@ -41,7 +41,7 @@
        disklabel -r -R ${VND_CDEV} tmplabel
        newfs -B le -m 0 -o space -i 3950 -c 80 ${VND_RDEV} 
        mount ${VND_DEV} ${MOUNT_POINT}
-       mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -U
+       mtree -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -U
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
            TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
        @echo ""
diff -r b864b18b5625 -r 843de5dfedd6 distrib/i386/floppies/ramdisk-small/Makefile
--- a/distrib/i386/floppies/ramdisk-small/Makefile      Wed Oct 10 03:41:24 2001 +0000
+++ b/distrib/i386/floppies/ramdisk-small/Makefile      Wed Oct 10 05:13:51 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2001/10/05 01:19:43 jmc Exp $
+#      $NetBSD: Makefile,v 1.10 2001/10/10 05:13:53 enami Exp $
 
 TOP=           ${.CURDIR}/..
 WARNS=1
@@ -22,7 +22,7 @@
 
 LISTS=         list
 CRUNCHCONF=    ${CBIN}.conf
-MTREE=         mtree.conf
+MTREECONF=     mtree.conf
 
 CRUNCHGEN?=    crunchgen
 
@@ -33,7 +33,7 @@
 
 realall: ${IMAGE}
 
-${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
+${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
        rm -f ${IMAGE}.tmp
        dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
        vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp \
@@ -42,7 +42,7 @@
        disklabel -r -R ${VND_CDEV} tmplabel
        newfs -B le -m 0 -o space -i 5000 -c 80 ${VND_RDEV}
Prev by Date: [src/trunk]: src/sys/ufs/lfs initialize the vnode's copy of the size in lfs_i...
Next by Date: [src/trunk]: src/sbin/mknod improve arg clamping
Previous by Thread: [src/trunk]: src/sys/ufs/lfs initialize the vnode's copy of the size in lfs_i...
Next by Thread: [src/trunk]: src/sbin/mknod improve arg clamping
Indexes:
Home | Main Index | Thread Index | Old Index