Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/x68k/floppies - reorganise to be more consistent wit...
details: https://anonhg.NetBSD.org/src/rev/ee374f653b1a
branches: trunk
changeset: 526863:ee374f653b1a
user: lukem <lukem%NetBSD.org@localhost>
date: Mon May 13 01:04:18 2002 +0000
description:
- reorganise to be more consistent with other distrib/* directories
(no need for a "common" subdir which contains stuff only really
referenced by one other directory)
- use Makefile.tarfloppy instead of local code to build floppies
- use .WAIT in the top-level Makefile appropriately
- install inst.fs directly from ramdisk/Makefile rather than providing
separate inst/Makefile
diffstat:
distrib/x68k/floppies/Makefile | 8 +-
distrib/x68k/floppies/bootfloppy.generic/Makefile | 29 +++++-
distrib/x68k/floppies/bootfloppy.sysinst/Makefile | 30 +++++-
distrib/x68k/floppies/common/Makefile.bootfloppy | 87 -------------------
distrib/x68k/floppies/common/Makefile.instkernel | 42 ---------
distrib/x68k/floppies/common/Makefile.ramdisk | 30 ------
distrib/x68k/floppies/common/disktab.preinstall | 31 ------
distrib/x68k/floppies/common/installboot.sh | 30 ------
distrib/x68k/floppies/common/termcap.vt | 57 ------------
distrib/x68k/floppies/inst/Makefile | 22 ----
distrib/x68k/floppies/instkernel.sysinst/Makefile | 13 --
distrib/x68k/floppies/instkernel/Makefile | 16 +++
distrib/x68k/floppies/ramdisk.sysinst/Makefile | 33 -------
distrib/x68k/floppies/ramdisk.sysinst/dot.hdprofile | 62 -------------
distrib/x68k/floppies/ramdisk.sysinst/dot.profile | 76 ----------------
distrib/x68k/floppies/ramdisk.sysinst/list | 95 ---------------------
distrib/x68k/floppies/ramdisk.sysinst/mtree.conf | 2 -
distrib/x68k/floppies/ramdisk.sysinst/services | 59 -------------
distrib/x68k/floppies/ramdisk/Makefile | 38 ++++++++
distrib/x68k/floppies/ramdisk/disktab.preinstall | 31 ++++++
distrib/x68k/floppies/ramdisk/dot.hdprofile | 62 +++++++++++++
distrib/x68k/floppies/ramdisk/dot.profile | 76 ++++++++++++++++
distrib/x68k/floppies/ramdisk/list | 91 ++++++++++++++++++++
distrib/x68k/floppies/ramdisk/services | 59 +++++++++++++
distrib/x68k/floppies/ramdisk/termcap.vt | 57 ++++++++++++
25 files changed, 479 insertions(+), 657 deletions(-)
diffs (truncated from 1246 to 300 lines):
diff -r 9fe543fa3162 -r ee374f653b1a distrib/x68k/floppies/Makefile
--- a/distrib/x68k/floppies/Makefile Sun May 12 23:16:52 2002 +0000
+++ b/distrib/x68k/floppies/Makefile Mon May 13 01:04:18 2002 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/05/07 14:08:30 isaki Exp $
+# $NetBSD: Makefile,v 1.10 2002/05/13 01:04:18 lukem Exp $
-SUBDIR= ramdisk.sysinst instkernel.sysinst bootfloppy.sysinst
-SUBDIR+= bootfloppy.generic inst
-
-.PHONY: release
+SUBDIR= bootfloppy.generic ramdisk .WAIT instkernel .WAIT
+SUBDIR+= bootfloppy.sysinst
TARGETS+= release
diff -r 9fe543fa3162 -r ee374f653b1a distrib/x68k/floppies/bootfloppy.generic/Makefile
--- a/distrib/x68k/floppies/bootfloppy.generic/Makefile Sun May 12 23:16:52 2002 +0000
+++ b/distrib/x68k/floppies/bootfloppy.generic/Makefile Mon May 13 01:04:18 2002 +0000
@@ -1,9 +1,26 @@
-# $NetBSD: Makefile,v 1.3 2002/05/07 14:08:31 isaki Exp $
+# $NetBSD: Makefile,v 1.4 2002/05/13 01:04:19 lukem Exp $
+
+.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-TOP= ${.CURDIR}/..
+.include <bsd.kernobj.mk>
+
+FLOPPYBASE= kern
+FLOPPYSIZE= 2400
+FLOPPYMETAFILE!=printf "USTAR.volsize.%o" ${FLOPPYSIZE}
+FLOPPYFILES= boot ${FLOPPYMETAFILE} netbsd
+FLOPPYSUFFIX= .fs
-BASENAME= kern
-IMAGE1= ${BASENAME}.fs
-INSTKERNEL= ${KERNOBJDIR}/GENERIC/netbsd
+FLOPPY_RELEASEDIR= installation/floppy
-.include "${TOP}/common/Makefile.bootfloppy"
+MDEC= ${DESTDIR}/usr/mdec
+KERNOBJ!= cd ${.CURDIR}/../instkernel && ${PRINTOBJDIR}
+FLOPPY_NETBSD= ${KERNOBJDIR}/GENERIC/netbsd
+FLOPPY_BOOT= ${MDEC}/boot
+# XXXDISTRIB: use MI installboot
+FLOPPYINSTBOOT=\
+ "dd if=${MDEC}/fdboot_ustar of=@IMAGE@ bs=8k count=1 conv=sync,notrunc"
+
+.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
+
+.include <bsd.prog.mk>
diff -r 9fe543fa3162 -r ee374f653b1a distrib/x68k/floppies/bootfloppy.sysinst/Makefile
--- a/distrib/x68k/floppies/bootfloppy.sysinst/Makefile Sun May 12 23:16:52 2002 +0000
+++ b/distrib/x68k/floppies/bootfloppy.sysinst/Makefile Mon May 13 01:04:18 2002 +0000
@@ -1,10 +1,26 @@
-# $NetBSD: Makefile,v 1.8 2002/05/07 14:08:32 isaki Exp $
+# $NetBSD: Makefile,v 1.9 2002/05/13 01:04:19 lukem Exp $
+
+.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-TOP= ${.CURDIR}/..
+.include <bsd.kernobj.mk>
+
+FLOPPYBASE= sysinst
+FLOPPYSIZE= 2400
+FLOPPYMETAFILE!=printf "USTAR.volsize.%o" ${FLOPPYSIZE}
+FLOPPYFILES= boot ${FLOPPYMETAFILE} netbsd
+FLOPPYSUFFIX= .fs
-BASENAME= sysinst
-IMAGE1= ${BASENAME}.fs
-INSTKERNDIR= ${TOP}/instkernel.sysinst
-INSTKERNNAME= netbsd.INSTALL.gz
+FLOPPY_RELEASEDIR= installation/floppy
-.include "${TOP}/common/Makefile.bootfloppy"
+MDEC= ${DESTDIR}/usr/mdec
+KERNOBJ!= cd ${.CURDIR}/../instkernel && ${PRINTOBJDIR}
+FLOPPY_NETBSD= ${KERNOBJ}/netbsd.INSTALL.gz
+FLOPPY_BOOT= ${MDEC}/boot
+# XXXDISTRIB: use MI installboot
+FLOPPYINSTBOOT=\
+ "dd if=${MDEC}/fdboot_ustar of=@IMAGE@ bs=8k count=1 conv=sync,notrunc"
+
+.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
+
+.include <bsd.prog.mk>
diff -r 9fe543fa3162 -r ee374f653b1a distrib/x68k/floppies/common/Makefile.bootfloppy
--- a/distrib/x68k/floppies/common/Makefile.bootfloppy Sun May 12 23:16:52 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-# $NetBSD: Makefile.bootfloppy,v 1.2 2002/05/07 14:08:32 isaki Exp $
-
-.include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-
-.include <bsd.kernobj.mk>
-
-# TOP is assumed to be defined by Makefile including this one.
-
-COMMONDIR= ${TOP}/common
-
-
-IMAGE?= xxx-${DISTRIBREV}.fs
-.ifndef INSTKERNEL
-INSTKERNNAME?= netbsd.xxx.gz
-INSTKERNODIR!= cd ${INSTKERNDIR} ; ${MAKE} print-objdir
-INSTKERNEL= ${INSTKERNODIR}/${INSTKERNNAME}
-.endif
-BOOTNAME?= USTAR.volsize.4540
-BASENAME?= boot
-IMAGE1?= ${BASENAME}1.fs
-
-MDEC= ${DESTDIR}/usr/mdec
-FSTMP= ustar.fs
-
-DISKSIZE?= 2400
-BLOCK8K?= 149
-
-
-CLEANFILES+= netbsd ${BOOTNAME} ${FSTMP}
-
-realall: netbsd ${BOOTNAME}
- tar cvf ${FSTMP} ${BOOTNAME} netbsd
- @echo
- @echo Making disk number one
- -mv -f ${IMAGE1} ${IMAGE1}.tmp
- cat ${MDEC}/fdboot_ustar /dev/zero | dd of=${IMAGE1}.tmp bs=1k count=8
- dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${IMAGE1}.tmp
- @ls -l ${FSTMP} | (read mode links uid gid size junk; \
- dksize=$$((${DISKSIZE} * 512 - 8 * 1024)); \
- disks=$$(($$size / $$dksize + 1)); \
- if test $$size -gt $$dksize; then \
- d=2; \
- while test $$d -le $$disks; do \
- echo; \
- echo Making disk number $$d.; \
- IMAGE=${BASENAME}$${d}.fs; \
- echo USTARFS $$d > $${IMAGE}; \
- skip=$$((($$d - 1) * ${BLOCK8K})); \
- if test $$d -eq $$disks; then \
- dd bs=8k seek=1 skip=$${skip} \
- conv=sync \
- if=${FSTMP} of=$${IMAGE}; \
- else \
- dd bs=8k seek=1 skip=$${skip} \
- conv=sync count=${BLOCK8K} \
- if=${FSTMP} of=$${IMAGE}; \
- fi; \
- d=$$(($$d + 1)); \
- done; \
- else \
- dd seek=$$(($${size} / 512 + 15)) count=1 \
- if=/dev/zero of=${IMAGE1}; \
- fi; \
- echo; \
- bytes=$$(($$dksize * $$disks - $$size)); \
- echo "There are $$bytes ($$(($$bytes / 1024))K) bytes free\
- on disk $$disks."; \
- )
- mv -f ${IMAGE1}.tmp ${IMAGE1}
-
-${BOOTNAME}:
- cp -fp ${MDEC}/boot ${BOOTNAME}
-
-netbsd:
- cp -fp ${INSTKERNEL} netbsd
-
-release: check_RELEASEDIR
- ${RELEASE_INSTALL} ${BASENAME}*.fs ${RELEASEDIR}/installation/floppy
- # XXX: do we want this?
- for f in ${RELEASEDIR}/installation/floppy/${BASENAME}*.fs; do \
- gzip -9v <$$f >$$f.gz; \
- done
-
-CLEANFILES+= ${IMAGE1} ${IMAGE1}.tmp ${BASENAME}?.fs
-
-.include <bsd.prog.mk>
diff -r 9fe543fa3162 -r ee374f653b1a distrib/x68k/floppies/common/Makefile.instkernel
--- a/distrib/x68k/floppies/common/Makefile.instkernel Sun May 12 23:16:52 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile.instkernel,v 1.2 2002/05/07 14:08:32 isaki Exp $
-
-.include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-
-.include <bsd.kernobj.mk>
-
-RAMDISKDIR?= ${.CURDIR}/../ramdisk/
-KERN?= netbsd-xxx
-KERNNAME?= netbsd.xxx
-GZNAME?= ${KERNNAME}.gz
-MDSETIMAGE?= mdsetimage
-
-.if ${RAMDISKDIR} != ""
-RAMDISK !=cd ${RAMDISKDIR}; ${MAKE} echoimage
-.endif
-
-CLEANFILES+= ${KERNNAME} ${GZNAME} netbsd.tmp*
-
-realall: ${GZNAME}
-
-.if defined(RAMDISK)
-${GZNAME}: ${KERN} ${RAMDISK}
- -/bin/rm -f netbsd.tmp*
- cp ${KERN} netbsd.tmp
- ${MDSETIMAGE} -v netbsd.tmp ${RAMDISK}
- mv -f netbsd.tmp ${KERNNAME}
-.else
-${KERNNAME}: ${KERN}
- cp ${KERN} ${.TARGET}
-.endif
- gzip -v9 ${KERNNAME}
-
-depend:
-
-release: check_RELEASEDIR .WAIT ${GZNAME}
-.ifndef NOKERNCOPY
- ${RELEASE_INSTALL} ${GZNAME} ${RELEASEDIR}/binary/kernel
-.endif
-
-
-.include <bsd.prog.mk>
diff -r 9fe543fa3162 -r ee374f653b1a distrib/x68k/floppies/common/Makefile.ramdisk
--- a/distrib/x68k/floppies/common/Makefile.ramdisk Sun May 12 23:16:52 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile.ramdisk,v 1.2 2002/05/07 14:08:32 isaki Exp $
-
-WARNS=1
-
-CRUNCHBIN?= ramdiskbin
-IMAGEENDIAN= be
-IMAGEDEPENDS+= ${CRUNCHBIN} ${AUXDEPENDS}
-POPULATEENV+= COMMONDIR=${COMMONDIR:Q}
-
-realall: ${IMAGE}
-
-# Use size-reduced libhack.
-${CRUNCHBIN}: libhack.o
-
-# Use stubs to eliminate some large stuff from libc
-HACKSRC= ${DISTRIBDIR}/utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-#${CBIN}: libhack.o
-
-# Used in building bootfloppy
-echoimage:
- @echo ${.OBJDIR}/${IMAGE}
-
-.include "${DISTRIBDIR}/common/Makefile.crunch"
-.include "${DISTRIBDIR}/common/Makefile.makedev"
-.include "${DISTRIBDIR}/common/Makefile.image"
-
-release:
-
-.include <bsd.prog.mk>
diff -r 9fe543fa3162 -r ee374f653b1a distrib/x68k/floppies/common/disktab.preinstall
--- a/distrib/x68k/floppies/common/disktab.preinstall Sun May 12 23:16:52 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-# $NetBSD: disktab.preinstall,v 1.1 2002/05/07 13:55:42 isaki Exp $
-#
-# Disk geometry and partition layout tables.
-# Key:
-# dt controller type
-# ty type of disk (fixed, removeable, simulated)
-# d[0-4] drive-type-dependent parameters
-# ns #sectors/track
-# nt #tracks/cylinder
-# nc #cylinders/disk
-# sc #sectors/cylinder, nc*nt default
-# su #sectors/unit, sc*nc default
-# se sector size, DEV_BSIZE default
-# rm rpm, 3600 default
-# sf supports bad144-style bad sector forwarding
-# sk sector skew per track, default 0
-# cs sector skew per cylinder, default 0
-# hs headswitch time, default 0
-# ts one-cylinder seek time, default 0
-# il sector interleave (n:1), 1 default
-# bs boot block size, default BBSIZE
-# sb superblock size, default SBSIZE
-# o[a-h] partition offsets in sectors
-# p[a-h] partition sizes in sectors
-# b[a-h] partition block sizes in bytes
-# f[a-h] partition fragment sizes in bytes
-# t[a-h] partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
diff -r 9fe543fa3162 -r ee374f653b1a distrib/x68k/floppies/common/installboot.sh
--- a/distrib/x68k/floppies/common/installboot.sh Sun May 12 23:16:52 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#! /bin/sh
Home |
Main Index |
Thread Index |
Old Index