[src/trunk]: src/distrib Convert to using ${MDSETIMAGE}.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/distrib Convert to using ${MDSETIMAGE}.
From: jmc <jmc%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 09:52:27 +0000
details:   https://anonhg.NetBSD.org/src/rev/97ad4fa731a2
branches:  trunk
changeset: 516343:97ad4fa731a2
user:      jmc <jmc%NetBSD.org@localhost>
date:      Sun Oct 21 23:23:19 2001 +0000

description:
Convert to using ${MDSETIMAGE}.

Provide a default value for $MDSETIMAGE and pull in bsd.own.mk to have
it overriden as needed for cross/-current builds.

diffstat:

 distrib/alpha/instkernel/instkernel/Makefile          |   5 +++--
 distrib/arm32/kernels/Makefile                        |   5 +++--
 distrib/bebox/floppies/bootfloppy-common/Makefile.inc |   6 ++++--
 distrib/hpcmips/Makefile                              |   5 +++--
 distrib/i386/floppies/kernel-ramdisk/Makefile         |  13 +++++++------
 distrib/i386/floppies/kernel-rescue/Makefile          |   7 ++++---
 distrib/mac68k/instkernel/instkernel/Makefile         |   5 +++--
 distrib/macppc/floppies/md-kernel/Makefile            |   8 +++++---
 distrib/mipsco/instkernel/Makefile                    |   5 +++--
 distrib/mvme68k/ramdisk/Makefile                      |   5 +++--
 distrib/news68k/floppies/ramdisk-kernel/Makefile      |   6 ++++--
 distrib/newsmips/floppies/bootfloppy/Makefile         |   6 ++++--
 distrib/pc532/floppies/inst-common/Makefile.inc       |   6 ++++--
 distrib/playstation2/Makefile                         |   5 +++--
 distrib/pmax/instkernel/Makefile                      |   5 +++--
 distrib/prep/floppies/bootfloppy-common/Makefile.inc  |   3 ++-
 distrib/prep/floppies/kernel-ramdisk/Makefile         |   6 ++++--
 distrib/sparc/bootfs/Makefile                         |   5 +++--
 distrib/sparc64/xminiroot/Makefile                    |   5 +++--
 distrib/sun2/ramdisk/Makefile                         |   6 ++++--
 distrib/sun3/ramdisk/Makefile                         |   8 +++++---
 distrib/vax/ramdisk-kernel/Makefile                   |   5 +++--
 distrib/x68k/floppies/bootfloppy-common/Makefile.inc  |   6 ++++--
 23 files changed, 84 insertions(+), 52 deletions(-)

diffs (truncated from 679 to 300 lines):

diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/alpha/instkernel/instkernel/Makefile
--- a/distrib/alpha/instkernel/instkernel/Makefile      Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/alpha/instkernel/instkernel/Makefile      Sun Oct 21 23:23:19 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2000/09/10 21:59:00 jhawk Exp $
+#      $NetBSD: Makefile,v 1.14 2001/10/21 23:23:19 jmc Exp $
 
 .include "../../../../Makefile.inc"
 
@@ -6,12 +6,13 @@
        printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" | \
        ${MAKE} -s -f-
 
+MDSETIMAGE?=   mdsetimage
 KERNEL?=${KERNOBJDIR}/INSTALL/netbsd
 STRIP?=                strip           # make STRIP=echo can be useful
 
 all:
        cp ${KERNEL} netbsd
-       mdsetimage -v netbsd ${RAMDISK}
+       ${MDSETIMAGE} -v netbsd ${RAMDISK}
        nm netbsd > netbsd.symbols
        ${STRIP} netbsd
        gzip -9f netbsd
diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/arm32/kernels/Makefile
--- a/distrib/arm32/kernels/Makefile    Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/arm32/kernels/Makefile    Sun Oct 21 23:23:19 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2000/11/12 00:56:13 matt Exp $
+#      $NetBSD: Makefile,v 1.2 2001/10/21 23:23:19 jmc Exp $
 
 TOP=           ${.CURDIR}/..
 
@@ -15,13 +15,14 @@
                    ${MAKE} -s -f-
 
 CLEANFILES+=   netbsd.tmp ${KERNELS:C/^.*$/netbsd.&.gz/g}
+MDSETIMAGE?=   mdsetimage
 
 all:   ${KERNELS:C/^.*$/netbsd.&.gz/g}
 
 .for kern in ${KERNELS}
 netbsd.${kern}.gz: ${KERNOBJDIR}/${kern}/netbsd ${RAMDISK}
        cp ${KERNOBJDIR}/${kern}/netbsd netbsd.tmp
-       mdsetimage -v netbsd.tmp ${RAMDISK}
+       ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
        ${STRIP} netbsd.tmp
        gzip -9 netbsd.tmp
        mv netbsd.tmp.gz ${.TARGET}
diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/bebox/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/bebox/floppies/bootfloppy-common/Makefile.inc     Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/bebox/floppies/bootfloppy-common/Makefile.inc     Sun Oct 21 23:23:19 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.4 2000/05/02 16:06:47 sjg Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2001/10/21 23:23:19 jmc Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -15,6 +15,7 @@
 IMAGE?=                xxx.fs
 KERN?=         netbsd-xxx
 MDEC=          ${DESTDIR}/usr/mdec
+MDSETIMAGE?=   mdsetimage
 
 LISTS=         ${COMMONDIR}/list
 RAMDISK        !=cd $(.CURDIR)/../ramdisk/; \
@@ -55,12 +56,13 @@
 
 netbsd.ram.gz: ${KERN} ${RAMDISK}
        cp ${KERN} netbsd.tmp
-       mdsetimage -v netbsd.tmp ${RAMDISK}
+       ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
        gzip netbsd.tmp
        mv netbsd.tmp.gz ${.TARGET}
 
 clean cleandir:
        /bin/rm -f *.core ${IMAGE} ${CLEANFILES}
 
+.include <bsd.own.mk>
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/hpcmips/Makefile
--- a/distrib/hpcmips/Makefile  Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/hpcmips/Makefile  Sun Oct 21 23:23:19 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2001/04/22 02:04:22 shin Exp $
+#      $NetBSD: Makefile,v 1.5 2001/10/21 23:23:20 jmc Exp $
 
 .include "../Makefile.inc"
 
@@ -15,6 +15,7 @@
 PBSDBOOTDIR = ${KERNSRCDIR}/arch/${MACHINE}/stand/pbsdboot
 PBSDBOOT = ${PBSDBOOTDIR}/pbsdboot.exe
 PBSDBOOT1 = ${PBSDBOOTDIR}/pbsdboot1.exe
+MDSETIMAGE?=   mdsetimage
 
 INSTKERNELS = TX3912 TX3922
 
@@ -29,7 +30,7 @@
 release:
        rm -f netbsd netbsd.gz
        cp ${KERNOBJDIR}/RAMDISK/netbsd .
-       mdsetimage netbsd ${MINIROOTOBJ}/miniroot.fs
+       ${MDSETIMAGE} netbsd ${MINIROOTOBJ}/miniroot.fs
        gzip -9 netbsd
        ${IINST} netbsd.gz ${ITARGET}/.
 .for instkern in ${INSTKERNELS}
diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/i386/floppies/kernel-ramdisk/Makefile
--- a/distrib/i386/floppies/kernel-ramdisk/Makefile     Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/i386/floppies/kernel-ramdisk/Makefile     Sun Oct 21 23:23:19 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2001/07/21 14:46:09 jdolecek Exp $
+#      $NetBSD: Makefile,v 1.6 2001/10/21 23:23:20 jmc Exp $
 
 TOP=           ${.CURDIR}/..
 
@@ -8,6 +8,7 @@
 
 MDEC=          ${DESTDIR}/usr/mdec
 STRIP?=                strip
+MDSETIMAGE?=   ${DESTDIR}/usr/sbin/mdsetimage
 
 #COMMONDIR=    ${TOP}/bootfloppy-common
 #LISTS=                ${COMMONDIR}/list
@@ -23,7 +24,7 @@
 
 netbsd.INSTALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL/netbsd ${RAMDISK}
        cp ${KERNOBJDIR}/INSTALL/netbsd netbsd.tmp
-       ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}
+       ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
        nm netbsd.tmp > netbsd.INSTALL.symbols
        ${STRIP} netbsd.tmp
        gzip -9 netbsd.tmp
@@ -31,7 +32,7 @@
 
 netbsd.INSTALL_LAPTOP.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_LAPTOP/netbsd ${RAMDISK}
        cp ${KERNOBJDIR}/INSTALL_LAPTOP/netbsd netbsd.tmp
-       ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}
+       ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
        nm netbsd.tmp > netbsd.INSTALL_LAPTOP.symbols
        ${STRIP} netbsd.tmp
        gzip -9 netbsd.tmp
@@ -40,7 +41,7 @@
 netbsd.INSTALL_TINY.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_TINY/netbsd ${RAMDISK_T}
        cp ${KERNOBJDIR}/INSTALL_TINY/netbsd netbsd.tmp
        gdb --write -batch -x ${.CURDIR}/nocluster.gdb netbsd.tmp </dev/null
-       ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_T}
+       ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_T}
        nm netbsd.tmp > netbsd.INSTALL_TINY.symbols
        ${STRIP} netbsd.tmp
        gzip -9 netbsd.tmp
@@ -48,7 +49,7 @@
 
 netbsd.INSTALL_SMALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_SMALL/netbsd ${RAMDISK_S}
        cp ${KERNOBJDIR}/INSTALL_SMALL/netbsd netbsd.tmp
-       ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_S}
+       ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_S}
        nm netbsd.tmp > netbsd.INSTALL_SMALL.symbols
        ${STRIP} netbsd.tmp
        gzip -9 netbsd.tmp
@@ -57,7 +58,7 @@
 netbsd.INSTALL_PS2.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_PS2/netbsd ${RAMDISK_S}
        cp ${KERNOBJDIR}/INSTALL_PS2/netbsd netbsd.tmp
        gdb --write -batch -x ${.CURDIR}/nocluster.gdb netbsd.tmp </dev/null
-       ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_S}
+       ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_S}
        nm netbsd.tmp > netbsd.INSTALL_PS2.symbols
        ${STRIP} netbsd.tmp
        gzip -9 netbsd.tmp
diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/i386/floppies/kernel-rescue/Makefile
--- a/distrib/i386/floppies/kernel-rescue/Makefile      Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/i386/floppies/kernel-rescue/Makefile      Sun Oct 21 23:23:19 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2001/06/24 12:09:04 veego Exp $
+#      $NetBSD: Makefile,v 1.4 2001/10/21 23:23:20 jmc Exp $
 
 TOP=           ${.CURDIR}/..
 
@@ -7,6 +7,7 @@
 .include <bsd.own.mk>
 
 MDEC=          ${DESTDIR}/usr/mdec
+MDSETIMAGE?=   ${DESTDIR}/usr/sbin/mdsetimage
 STRIP?=                strip
 
 RAMDISK_T!=    cd ${.CURDIR}/../ramdisk-rescuetiny/; \
@@ -18,7 +19,7 @@
 
 netbsd.INSTALL_TINY.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_TINY/netbsd ${RAMDISK_T}
        cp ${KERNOBJDIR}/INSTALL_TINY/netbsd netbsd.tmp
-       ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_T}
+       ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_T}
        nm netbsd.tmp > netbsd.INSTALL_TINY.symbols
        ${STRIP} netbsd.tmp
        gzip -9 netbsd.tmp
@@ -26,7 +27,7 @@
 
 netbsd.INSTALL_SMALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_SMALL/netbsd ${RAMDISK_S}
        cp ${KERNOBJDIR}/INSTALL_SMALL/netbsd netbsd.tmp
-       ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_S}
+       ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK_S}
        nm netbsd.tmp > netbsd.INSTALL_SMALL.symbols
        ${STRIP} netbsd.tmp
        gzip -9 netbsd.tmp
diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/mac68k/instkernel/instkernel/Makefile
--- a/distrib/mac68k/instkernel/instkernel/Makefile     Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/mac68k/instkernel/instkernel/Makefile     Sun Oct 21 23:23:19 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2000/09/23 13:53:42 simonb Exp $
+#      $NetBSD: Makefile,v 1.5 2001/10/21 23:23:20 jmc Exp $
 
 .include "../../../Makefile.inc"
 
@@ -7,11 +7,12 @@
        ${MAKE} -s -f-
 
 INSTALL_KERNEL?=INSTALL
+MDSETIMAGE?=   mdsetimage
 KERNEL=${KERNOBJDIR}/${INSTALL_KERNEL}/netbsd
 
 all:
        cp ${KERNEL} netbsd-${INSTALL_KERNEL}
-       mdsetimage -T 0x0 -v netbsd-${INSTALL_KERNEL} ${RAMDISK}
+       ${MDSETIMAGE} -T 0x0 -v netbsd-${INSTALL_KERNEL} ${RAMDISK}
 # XXX Doesn't boot with this. Why?
 #      strip netbsd-${INSTALL_KERNEL}
 # XXX Reported not to boot on some machines.
diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/macppc/floppies/md-kernel/Makefile
--- a/distrib/macppc/floppies/md-kernel/Makefile        Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/macppc/floppies/md-kernel/Makefile        Sun Oct 21 23:23:19 2001 +0000
@@ -1,11 +1,13 @@
-#      $NetBSD: Makefile,v 1.1 2001/04/09 20:19:55 tsubai Exp $
+#      $NetBSD: Makefile,v 1.2 2001/10/21 23:23:20 jmc Exp $
 
 TOP= ${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
+.include <bsd.own.mk>
 .include <bsd.kernobj.mk>
 
 STRIP?= strip
+MDSETIMAGE?=   mdsetimage
 
 KERNELS= netbsd.INSTALL.gz netbsd.GENERIC_MD.gz
 CLEANFILES+= ${KERNELS} netbsd
@@ -17,14 +19,14 @@
 
 netbsd.INSTALL.gz: ${KERNOBJDIR}/INSTALL/netbsd ${RAMDISK}
        cp ${KERNOBJDIR}/INSTALL/netbsd .
-       mdsetimage -v netbsd ${RAMDISK}
+       ${MDSETIMAGE} -v netbsd ${RAMDISK}
        ${STRIP} netbsd
        gzip -9 netbsd
        mv netbsd.gz ${.TARGET}
 
 netbsd.GENERIC_MD.gz: ${KERNOBJDIR}/GENERIC_MD/netbsd ${RAMDISK}
        cp ${KERNOBJDIR}/GENERIC_MD/netbsd .
-       mdsetimage -v netbsd ${RAMDISK}
+       ${MDSETIMAGE} -v netbsd ${RAMDISK}
        gzip -9 netbsd
        mv netbsd.gz ${.TARGET}
 
diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/mipsco/instkernel/Makefile
--- a/distrib/mipsco/instkernel/Makefile        Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/mipsco/instkernel/Makefile        Sun Oct 21 23:23:19 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2001/03/05 05:07:45 wdk Exp $
+#      $NetBSD: Makefile,v 1.4 2001/10/21 23:23:21 jmc Exp $
 
 .include "../../../Makefile.inc"
 .include <bsd.kernobj.mk>
@@ -6,6 +6,7 @@
 
 DISKBINDIR=    ${RELEASEDIR}/installation/diskimage
 KERNBINDIR=    ${RELEASEDIR}/binary/kernel
+MDSETIMAGE?=   mdsetimage
 
 IMAGE=         diskimage
 IMAGESIZE=     4096 # 512 byte blocks, update disktab.diskimage if changed
@@ -34,7 +35,7 @@
 
 netbsd.gz: ${KERN} ${RAMDISK}
        cp ${KERN} netbsd
-       mdsetimage -v netbsd ${RAMDISK}
+       ${MDSETIMAGE} -v netbsd ${RAMDISK}
 .ifdef ECOFF_KERNEL
        elf2ecoff netbsd netbsd.ecoff
        rm -f netbsd.ecoff.gz
diff -r 2b7db2366829 -r 97ad4fa731a2 distrib/mvme68k/ramdisk/Makefile
--- a/distrib/mvme68k/ramdisk/Makefile  Sun Oct 21 23:21:53 2001 +0000
+++ b/distrib/mvme68k/ramdisk/Makefile  Sun Oct 21 23:23:19 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2001/10/21 03:30:36 chs Exp $
+#      $NetBSD: Makefile,v 1.13 2001/10/21 23:23:21 jmc Exp $
 
 TOP=           ${.CURDIR}/..
 
@@ -21,6 +21,7 @@
 VND_CRDEV=      /dev/r${VND}c
Prev by Date: [src/trunk]: src/distrib/sparc/bootfs Use ${OBJCOPY} instead of objcopy direc...
Next by Date: [src/trunk]: src/sys/dev/scsipi Add ST15150N to quirk table, as per PR/13817.
Previous by Thread: [src/trunk]: src/distrib/sparc/bootfs Use ${OBJCOPY} instead of objcopy direc...
Next by Thread: [src/trunk]: src/sys/dev/scsipi Add ST15150N to quirk table, as per PR/13817.
Indexes:
Home | Main Index | Thread Index | Old Index