[src/trunk]: src/distrib/alpha convert instkernel/fdset into using NDWO Makef...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b96af7daf955
branches:  trunk
changeset: 526293:b96af7daf955
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Apr 30 15:08:44 2002 +0000

description:
convert instkernel/fdset into using NDWO Makefile.tarfloppy, which
allows UNPRIVED cross building of aforementioned directory

diffstat:

 distrib/alpha/Makefile                  |   6 +-
 distrib/alpha/instkernel/fdset/Makefile |  76 ++++++--------------------------
 2 files changed, 17 insertions(+), 65 deletions(-)

diffs (106 lines):

diff -r bd7ae1529f5d -r b96af7daf955 distrib/alpha/Makefile
--- a/distrib/alpha/Makefile    Tue Apr 30 14:45:12 2002 +0000
+++ b/distrib/alpha/Makefile    Tue Apr 30 15:08:44 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2002/04/26 17:30:00 matt Exp $
+#      $NetBSD: Makefile,v 1.18 2002/04/30 15:08:44 lukem Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/Makefile.inc"
@@ -17,8 +17,8 @@
        ${RELINSTALL} ${.CURDIR}/README.files ${ITARGET}/$i/.
 .endfor
        ${RELINSTALL} ${CDHDTAPEOBJ}/cdhdtape ${ITARGET}/diskimage/.
-       ${RELINSTALL} ${FDSETOBJ}/disk1of2 ${ITARGET}/floppy/.
-       ${RELINSTALL} ${FDSETOBJ}/disk2of2 ${ITARGET}/floppy/.
+       ${RELINSTALL} ${FDSETOBJ}/disk1.fs ${ITARGET}/floppy/disk1of2
+       ${RELINSTALL} ${FDSETOBJ}/disk2.fs ${ITARGET}/floppy/disk2of2
        ${RELINSTALL} ${INSTKERNOBJ}/netbsd.INSTALL.gz ${ITARGET}/instkernel/netbsd.gz
 #      ${RELINSTALL} ${GENERICOBJ}/GENERIC.fs ${ITARGET}/misc/.
 
diff -r bd7ae1529f5d -r b96af7daf955 distrib/alpha/instkernel/fdset/Makefile
--- a/distrib/alpha/instkernel/fdset/Makefile   Tue Apr 30 14:45:12 2002 +0000
+++ b/distrib/alpha/instkernel/fdset/Makefile   Tue Apr 30 15:08:44 2002 +0000
@@ -1,68 +1,20 @@
-#      $NetBSD: Makefile,v 1.8 2002/04/26 01:26:49 matt Exp $
+#      $NetBSD: Makefile,v 1.9 2002/04/30 15:08:45 lukem Exp $
 
 .include <bsd.own.mk>
-
-IMAGE1=                disk1of2
-IMAGE2=                disk2of2
-
-INSTKERNELDIR!=        cd ${.CURDIR}/../instkernel && ${PRINTOBJDIR}
-INSTKERNEL=    ${INSTKERNELDIR}/netbsd.INSTALL.gz
+.include "${NETBSDSRCDIR}/distrib/Makefile.inc"
 
-MOUNT_POINT?=  /mnt
-VND?=          vnd0
-VND_DEV=       /dev/${VND}a
-VND_RDEV=      /dev/r${VND}a
-VND_CDEV=      /dev/${VND}c
-VND_CRDEV=     /dev/r${VND}c
-KERN?=         netbsd-xxx
-MDEC=          ${DESTDIR}/usr/mdec
-FSTMP=         ustar.tmp
-
-PRIMARYBOOT=   ${DESTDIR}/usr/mdec/bootxx.old
-SECONDARYBOOT= ${DESTDIR}/usr/mdec/boot
-
-DISKTYPE=      floppy
-
-CLEANFILES+=   netbsd ${FSTMP} ${IMAGE1} ${IMAGE2} tmp tmp.gz
+FLOPPYBASE=    disk
+FLOPPYSIZE=    2880
+FLOPPYFILES=   boot netbsd
+FLOPPYMAX=     2
 
-all:   netbsd
-       @echo Making disk number one.
-       tar cvf ${FSTMP} ${SECONDARYBOOT} netbsd
-       @ echo ''
-       @ls -l ${FSTMP} | (read mode links uid gid size junk;   \
-               bytes=$$((2880 * 512 * 2 - $$size - 8 * 1024));         \
-               echo There are $$bytes \($$(($$bytes / 1024))K\) bytes free\
-                       on disk 2.)
-       @ echo ''
-       dd if=/dev/zero of=${IMAGE1} count=2880
-       vnconfig -t ${DISKTYPE} -v -c ${VND} ${IMAGE1}
-       dd bs=8k seek=1 count=179 if=${FSTMP} of=${VND_CDEV}
-       disklabel -rw ${VND} ${DISKTYPE}
-       @echo "installing new bootblocks"
-       ${MDEC}/installboot.old -b 17 -v        \
-               ${SECONDARYBOOT} ${PRIMARYBOOT} ${VND_CRDEV}
-       vnconfig -u ${VND}
-       @echo Making disk number two.
-       echo USTARFS 2 > ${IMAGE2}
-       (echo 'Prototype image created on: ';   \
-               echo -n '     '; date;          \
-               echo -n '     '; date -u) >> ${IMAGE2}
-       (echo Hash value of corresponding volume:; md5 ${IMAGE1}) >> ${IMAGE2}
-       dd bs=8k seek=1 skip=179 conv=sync if=${FSTMP} of=${IMAGE2}
-       @rm ${FSTMP}
+MDEC=          ${DESTDIR}/usr/mdec
+KERNOBJ!=      cd ${.CURDIR}/../instkernel && ${PRINTOBJDIR}
+FLOPPY_NETBSD= ${KERNOBJ}/netbsd.INSTALL.gz
+FLOPPY_BOOT=   ${MDEC}/ustarboot
+FLOPPYINSTBOOT=\
+       "${INSTALLBOOT} -m ${MACHINE} -t raw -v -b 17 @IMAGE@ ${FLOPPY_BOOT}"
 
-netbsd: ${INSTKERNEL}
-       cp ${INSTKERNEL} netbsd
-
-unconfig:
-       -umount -f ${MOUNT_POINT}
-       -vnconfig -u ${VND}
-       -/bin/rm -f ${IMAGE1} ${IMAGE2}
+.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
 
-clean cleandir distclean:
-       /bin/rm -f *.core ${CLEANFILES}
-
-# nothing to do here
-depend includes lint regress tags:
-
-.include <bsd.obj.mk>
+.include <bsd.prog.mk>