[src/trunk]: src/distrib/i386/floppies Migrate MI-shareable stuff to distrib/...

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

details:   https://anonhg.NetBSD.org/src/rev/99d7000ab439
branches:  trunk
changeset: 525725:99d7000ab439
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Apr 16 09:06:49 2002 +0000

description:
Migrate MI-shareable stuff to distrib/common/Makefile.tarfloppy.

diffstat:

 distrib/i386/floppies/bootfloppy-big/Makefile    |   4 +-
 distrib/i386/floppies/bootfloppy-com/Makefile    |   4 +-
 distrib/i386/floppies/common/Makefile.bootfloppy |  87 ++++++-----------------
 3 files changed, 27 insertions(+), 68 deletions(-)

diffs (135 lines):

diff -r 512cdf3c26f7 -r 99d7000ab439 distrib/i386/floppies/bootfloppy-big/Makefile
--- a/distrib/i386/floppies/bootfloppy-big/Makefile     Tue Apr 16 09:00:20 2002 +0000
+++ b/distrib/i386/floppies/bootfloppy-big/Makefile     Tue Apr 16 09:06:49 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2002/04/16 05:23:37 lukem Exp $
+#      $NetBSD: Makefile,v 1.18 2002/04/16 09:06:49 lukem Exp $
 
 # This Makefile builds a boot image on a 2.88M-sized image.
 #
@@ -19,6 +19,6 @@
 FLOPPYPAD=     1
 FLOPPYKERNDIR= kernel-ramdisk
 FLOPPYKERNEL=  netbsd.INSTALL.gz
-FLOPPYMETA!=   printf "USTAR.volsize.%o" ${FLOPPYSIZE}
+FLOPPYMETAFILE!=printf "USTAR.volsize.%o" ${FLOPPYSIZE}
 
 .include "${.CURDIR}/../common/Makefile.bootfloppy"
diff -r 512cdf3c26f7 -r 99d7000ab439 distrib/i386/floppies/bootfloppy-com/Makefile
--- a/distrib/i386/floppies/bootfloppy-com/Makefile     Tue Apr 16 09:00:20 2002 +0000
+++ b/distrib/i386/floppies/bootfloppy-com/Makefile     Tue Apr 16 09:06:49 2002 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2002/04/16 05:23:38 lukem Exp $
+#      $NetBSD: Makefile,v 1.2 2002/04/16 09:06:51 lukem Exp $
 
 FLOPPYBASE=    boot-com
 FLOPPYMAX=     2
 FLOPPYKERNDIR= kernel-ramdisk
 FLOPPYKERNEL=  netbsd.INSTALL.gz
-FLOPPYBOOTCODE=        ${DESTDIR}/usr/mdec/biosboot_com0.sym   # Serial output
+FLOPPY_BOOT=   ${DESTDIR}/usr/mdec/biosboot_com0.sym   # Serial output
 
 .include "${.CURDIR}/../common/Makefile.bootfloppy"
diff -r 512cdf3c26f7 -r 99d7000ab439 distrib/i386/floppies/common/Makefile.bootfloppy
--- a/distrib/i386/floppies/common/Makefile.bootfloppy  Tue Apr 16 09:00:20 2002 +0000
+++ b/distrib/i386/floppies/common/Makefile.bootfloppy  Tue Apr 16 09:06:49 2002 +0000
@@ -1,76 +1,35 @@
-#      $NetBSD: Makefile.bootfloppy,v 1.7 2002/04/16 05:23:40 lukem Exp $
+#      $NetBSD: Makefile.bootfloppy,v 1.8 2002/04/16 09:06:51 lukem Exp $
 #
 # Makefile snippet to create a set of USTAR floppies
 #
 
+#
+# Required variables:
+#      FLOPPYBASE      Basename of floppies. Floppy number ${n} will
+#                      be generated as ${FLOPPYBASE}${n}.fs
+#      FLOPPYKERNDIR   ${FLOPPYKERNEL} is from ${.CURDIR}/../${FLOPPYKERNDIR}
+#      FLOPPYKERNEL    Kernel to copy
+#
+# Optional variables:
+#      FLOPPY_BOOT     Bootstrap to use.  [${DESTDIR}/usr/mdec/biosboot.sym]
+#
+
 .include <bsd.own.mk>
 .include "${_SRC_TOP_}/distrib/Makefile.inc"
 
-#
-# Required variables:
-#      _SRC_TOP_       Top level of src tree (set by <bsd.own.mk>)
-#      FLOPPYBASE      Basename of floppies. Floppy number ${n} will
-#                      be generated as ${FLOPPYBASE}${n}.fs
-#      FLOPPYKERNEL    Kernel to copy 
-#      FLOPPYKERNDIR   ${FLOPPYKERNEL} is from ${.CURDIR}/../${FLOPPYKERNDIR}
-
-#
-# Optional variables:
-#      FLOPPYSIZE      Size of floppy in 512 byte blocks.      [2880]
-#      FLOPPYMAX       Maximum number of floppies to build.    [1]
-#                      If 1, final image is installed as ${FLOPPYBASE}.fs
-#      FLOPPYBOOTCODE  Boot blocks to use.  [${DESTDIR}/usr/mdec/biosboot.sym]
-#      FLOPPYMETA      ustar metafile (written between "boot" & "netbsd")
-#      FLOPPYPAD       If defined, pad the last floppy to ${FLOPPYSIZE}
-#
-
-FLOPPYSIZE?=   2880
-FLOPPYMAX?=    1
-FLOPPYBOOTCODE?=${DESTDIR}/usr/mdec/biosboot.sym
-FLOPPYFILES=   boot ${FLOPPYMETA} netbsd
-
-FLOPPYKERNOBJ!=        cd ${.CURDIR}/../${FLOPPYKERNDIR} && ${PRINTOBJDIR}
-
-boot: ${FLOPPYBOOTCODE}
-       @echo "Copying ${FLOPPYBOOTCODE} to boot"
-       @rm -f boot
-       @cp ${FLOPPYBOOTCODE} boot
-       @${STRIP} boot
+FLOPPYSIZE?=           2880
+MDEC=                  ${DESTDIR}/usr/mdec
+#      XXXDISTRIB: need MI installboot for i386
+FLOPPYINSTBOOT=                "${MDEC}/installboot -b 17 -f ${FLOPPY_BOOT} @IMAGE@"
+FLOPPYKERNOBJ!=                cd ${.CURDIR}/../${FLOPPYKERNDIR} && ${PRINTOBJDIR}
 
-netbsd: ${FLOPPYKERNOBJ}/${FLOPPYKERNEL}
-       @echo "Copying ${FLOPPYKERNOBJ}/${FLOPPYKERNEL} to netbsd"
-       @rm -f netbsd
-       @cp ${FLOPPYKERNOBJ}/${FLOPPYKERNEL} netbsd
-
-.if defined(FLOPPYMETA)
-${FLOPPYMETA}:
-       echo "Creating ${FLOPPYMETA}"
-       @rm -f ${FLOPPYMETA}
-       @touch ${FLOPPYMETA}
-.endif
+FLOPPY_BOOT?=          ${MDEC}/biosboot.sym
+FLOPPY_BOOT_STRIP=     yes
+FLOPPY_NETBSD=         ${FLOPPYKERNOBJ}/${FLOPPYKERNEL}
+FLOPPYFILES=           boot ${FLOPPYMETAFILE} netbsd
 
-${FLOPPYBASE}1.fs: ${FLOPPYFILES}
-       @echo "Creating ${FLOPPYBASE}1.fs from ${FLOPPYFILES}
-#              XXXDISTRIB; need MI installboot for i386
-       sh ${DISTRIBDIR}/common/buildfloppies.sh \
-           -i "${DESTDIR}/usr/mdec/installboot -b 17 -f ${FLOPPYBOOTCODE} @IMAGE@" \
-           ${FLOPPYMAX:D-m "${FLOPPYMAX}"} ${FLOPPYPAD:D-p} \
-           ${FLOPPYBASE} ${FLOPPYSIZE} ${FLOPPYFILES}
-
-CLEANFILES+=   ${FLOPPYFILES} ${FLOPPYBASE}?.fs
-
+FLOPPYINSTDIR=         installation/floppy
 
-realall: ${FLOPPYBASE}1.fs
-
-release: check_RELEASEDIR .WAIT ${FLOPPYBASE}1.fs
-       -mkdir -p ${RELEASEDIR}/installation/floppy
-       if [ -e ${FLOPPYBASE}2.fs ]; then \
-               ${RELINSTALL} ${FLOPPYBASE}?.fs \
-                   ${RELEASEDIR}/installation/floppy; \
-       else \
-               ${RELINSTALL} ${FLOPPYBASE}1.fs \
-                   ${RELEASEDIR}/installation/floppy/${FLOPPYBASE}.fs; \
-       fi
-
+.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
 
 .include <bsd.prog.mk>