Mercurial > hg > Members > kono > nitros9-code

changeset 1771:7f2e75d5b62d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build improvements
author boisy
date Fri, 01 Apr 2005 21:19:32 +0000
parents fd154c8337f3
children 5ba8e711a1a3
files level1/makefile level1/makefile.cust level2/coco3/bootfiles/makefile.cust level2/coco3_6309/bootfiles/makefile.cust level2/makefile level2/makefile.cust rules.mak scripts/bundi scripts/makeboot
diffstat 9 files changed, 54 insertions(+), 680 deletions(-) [+]
line wrap: on
line diff
--- a/level1/makefile	Fri Apr 01 20:23:11 2005 +0000
+++ b/level1/makefile	Fri Apr 01 21:19:32 2005 +0000
@@ -1,6 +1,8 @@
 include ../rules.mak
 
-RELEASE		= nos96809l1v030205
+CPU		= 6809
+DISTRO		= $(CPU)L2
+RELEASE		= nos9$(CPU)l1v030205
 BOOTFILE_CO32	= bootfiles/bootfile_co51
 BOOTFILE_CO51	= bootfiles/bootfile_co51
 BOOTFILE_CO80	= bootfiles/bootfile_co51
@@ -27,9 +29,12 @@
 ROOTFILES	= startup
 
 PACKAGENAME	= $(RELEASE).zip
-DSK360K_1	= $(RELEASE)_ds40_1.dsk
-DSK360K_2	= $(RELEASE)_ds40_2.dsk
-DSK720K		= $(RELEASE)_ds80.dsk
+DSK360K_1       = $(RELEASE)_40d_1.dsk
+LDSK360K_1      = latest_40d_1.dsk
+DSK360K_2       = $(RELEASE)_40d_2.dsk
+LDSK360K_2      = latest_40d_2.dsk
+DSK720K         = $(RELEASE)_80d.dsk
+LDSK720K        = latest_80d.dsk
 
 
 # Make all components
@@ -46,7 +51,10 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
+	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(LDSK360K_1) $(DSK360K_1_50HZ) \
+	$(LDSK360K_1_50HZ) $(DSK360K_2) $(LDSK360K_2)  $(DSK720K) \
+	$(LDSK720K) $(DSK720K_50HZ) $(LDSK720K_50HZ)
+
 
 dsk: all $(PACKAGENAME)
 
@@ -75,6 +83,8 @@
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(RM) $(LDSK360K_1)
+	$(SOFTLINK) $@ $(LDSK360K_1)
 
 $(DSK360K_2):
 	$(RM) $@
@@ -111,6 +121,8 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
+	$(RM) $(LDSK360K_2)
+	$(SOFTLINK) $@ $(LDSK360K_2)
 
 $(DSK720K):
 	$(RM) $@
@@ -160,5 +172,7 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
+	$(RM) $(LDSK720K)
+	$(SOFTLINK) $@ $(LDSK720K)
 
 
--- a/level1/makefile.cust	Fri Apr 01 20:23:11 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-include ../rules.mak
-
-RELEASE		= nos96809l1cust
-BOOTFILE	= bootfiles/bootfile_cust
-KERNELFILE	= bootfiles/kernel_drivewire
-DIRS		= cmds modules defs sys bootfiles
-
-# Specify which shell should be used
-#WHICHSHELL	= shellplus
-WHICHSHELL	= shell_21
-
-CMDS		= $(shell $(CD) cmds; make showcocoobjs)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
-MODULECMDS	= shell del echo format makdir merge os9gen prompt
-
-SYS		= $(shell $(CD) sys; make showobjs)
-DEFS		= $(shell $(CD) defs; make showobjs)
-ROOTFILES	= startup
-
-PACKAGENAME	= $(RELEASE).zip
-DSK720K		= $(RELEASE).dsk
-
-
-# Make all components
-all:
-	@$(ECHO) "**************************************************"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "*        NitrOS-9/6809 Level 1 Distribution      *"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "**************************************************"
-	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
-
-# Clean all components
-clean:	dskclean
-	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
-
-dskclean:
-	-$(RM) $(DSK720K)
-
-dsk: all $(DSK720K)
-
-$(DSK720K):
-	$(RM) $@
-	$(OS9FORMAT) -l32768 -q $@ -n"NitrOS-9/6809 Level 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNELFILE)
-	$(MAKDIR) $@,CMDS
-	$(MAKDIR) $@,SYS
-	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
-	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
-	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
-	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES) $@,.
-	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
-	$(MAKDIR) $@,NITROS9
-	$(MAKDIR) $@,NITROS9/6809L1
-	$(MAKDIR) $@,NITROS9/6809L1/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
-	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
-	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
-	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
-	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
-	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
-	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
-	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
-	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
-	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
-	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
-	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
-	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
-
--- a/level2/coco3/bootfiles/makefile.cust	Fri Apr 01 20:23:11 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-include ../../rules.mak
-
-# Module directory
-MD		= ../modules
-# Commands directory
-CD		= ../cmds
-# Third Party directories
-3PB		= $(3RDPARTY)/booters
-3PM		= $(3RDPARTY)/fmgrs
-3PD		= $(3RDPARTY)/drivers
-P2D		= $(3RDPARTY)/p2mods
-
-DEPENDS		= ./makefile.cust
-
-KERNEL_1773	= $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_TC3	= $(MD)/rel_80 $(C9)/Products/SuperDrivers/software/6809l2/boot_tc3 $(MD)/krn
-KERNEL_IDE	= $(MD)/rel_80 $(MD)/boot_idelba $(MD)/krn
-KERNEL_DW	= $(MD)/rel_80 $(C9)/Products/DriveWire/software/6809l2/boot_dw $(MD)/krn
-
-# OS-9 disk bootfile to allow booting from WD1773 disk controller
-BOOTFILE_1773	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-		$(MD)/rbf.mn \
-		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
-		$(MD)/ddd0_40d.dd \
-		$(MD)/scf.mn $(MD)/cc3io.dr \
-		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-		$(MD)/windint.io \
-		$(MD)/term_win80.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft
-
-# OS-9 disk bootfile to allow booting from TC^3 SCSI controller
-# This is a custom bootfile made by Boisy for his system
-BOOTFILE_TC3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-		$(MD)/rbf.mn \
-		$(C9)/superscsi/6809l2/superscsi_tc3.dr \
-		$(C9)/superscsi/6809l2/dd_ez135_tc3.dd \
-		$(C9)/superscsi/6809l2/h5_zip100_tc3.dd \
-		$(C9)/superscsi/6809l2/c3_cdrom_tc3.dd \
-		$(C9)/superscsi/6809l2/hb_255_tc3.dd \
-		$(C9)/drivewire/6809l2/drivewire.dr \
-		$(C9)/drivewire/6809l2/x0.dd \
-		$(C9)/drivewire/6809l2/x1.dd \
-		$(C9)/drivewire/6809l2/x2.dd \
-		$(C9)/drivewire/6809l2/x3.dd \
-		$(3PD)/sdisk3/sdisk3_dmc_68.dr \
-		$(3PD)/sdisk3/d0_80d.dd $(3PD)/sdisk3/d1_40d.dd \
-		$(MD)/scf.mn $(MD)/cc3io.dr \
-		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-		$(MD)/windint.io $(MD)/vdgint_small.io \
-		$(MD)/term_win80.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-		$(MD)/vrn.dr $(MD)/nil.dd \
-		$(MD)/vi.dd $(MD)/ftdd.dd \
-		$(MD)/sc6551.dr $(MD)/t2_sc6551.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_cloud9
-
-# OS-9 disk bootfile to allow booting from TC^3 SCSI controller
-# This is a custom bootfile made by Boisy for his system
-BOOTFILE_EXP	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-		$(MD)/rbf.mn \
-		$(3PD)/sdisk3/sdisk3_dmc_63.dr \
-		$(3PD)/sdisk3/d0_80d.dd $(3PD)/sdisk3/d1_40d.dd \
-		$(MD)/scf.mn $(MD)/cc3io.dr \
-		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-		$(MD)/windint.io $(MD)/vdgint_small.io \
-		$(MD)/term_win80.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-		$(MD)/vrn.dr $(MD)/nil.dd \
-		$(MD)/vi.dd $(MD)/ftdd.dd \
-		$(MD)/sc6551.dr $(MD)/t2_sc6551.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_cloud9
-#		$(C9)/products/SuperSCSI/softwarev2/6809l2/superdriver.dr \
-#		$(C9)/products/SuperSCSI/softwarev2/6809l2/lltc3.dr \
-#		$(C9)/products/SuperSCSI/softwarev2/6809l2/h5_ez135_tc3.dd \
-
-BOOTFILE_LUCKEY  = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-                $(MD)/rbf.mn \
-                $(C9)/Products/SuperDrivers/software/6809l2/rbsuper.dr \
-                $(C9)/Products/SuperDrivers/software/6809l2/llide.dr \
-                $(C9)/Products/SuperDrivers/software/6809l2/lltc3.dr \
-                $(C9)/Products/SuperDrivers/software/6809l2/dd_ide.dd \
-                $(C9)/Products/SuperDrivers/software/6809l2/i0_ide.dd \
-                $(C9)/Products/SuperDrivers/software/6809l2/ih_ide.dd \
-                $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
-                $(MD)/scf.mn $(MD)/cc3io.dr \
-                $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-                $(MD)/grfint.io \
-                $(MD)/term_win80.dt \
-                $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-                $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-                $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-                $(MD)/clock_60hz $(MD)/clock2_soft
-
-BOOTFILE_CUST2  = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-                $(MD)/rbf.mn \
-                $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \
-                $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x1.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x2.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x3.dd \
-                $(MD)/scf.mn \
-                $(MD)/cc3io.dr \
-                $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-                $(MD)/grfint.io \
-                $(MD)/term_win80.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-                $(MD)/sc6551.dr \
-                $(MD)/t2_sc6551.dd \
-                $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-                $(MD)/clock_60hz $(MD)/clock2_soft \
-                $(C9)/Products/NitrOS-9\ ROM\ Kit/software/6809l2/sysgo_rom \
-		$(CD)/shell_21 $(CD)/devs $(CD)/deiniz $(CD)/dmem \
-		$(CD)/pmap
-                
-BOOTFILE_CUST   = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-                $(MD)/rbf.mn \
-                $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \
-                $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \
-                $(MD)/rammer.dr \
-                $(MD)/r0_8k.dd \
-                $(MD)/scf.mn \
-                $(MD)/sc6551.dr \
-                $(MD)/cc3io.dr \
-                $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-                $(MD)/grfint.io \
-                $(MD)/term_win80.dt \
-                $(MD)/term_sc6551.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-                $(MD)/clock_60hz \
-                $(MD)/clock2_soft \
-                $(MD)/sysgo_dd
-#                $(C9)/Products/DriveWire/software/6809l2/clock2_dw \
-
-
-BOOTFILES	= bootfile_1773 bootfile_cust
-KERNELS		= kernel_1773 kernel_tc3 kernel_drivewire
-
-ALLOBJS		= $(BOOTFILES) $(KERNELS)
-
-all:	$(ALLOBJS)
-
-bootfile_1773: $(BOOTFILE_1773) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_1773)>$@
-
-bootfile_cust: $(BOOTFILE_CUST) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_CUST)>$@
-
-# Howard Luckey's bootfile for his SuperIDE purchased on May 16, 2004
-bootfile_luckey: $(BOOTFILE_LUCKEY) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_LUCKEY)>$@
-
-kernel_1773: $(KERNEL_1773) $(DEPENDS)
-	$(MERGE) $(KERNEL_1773)>$@
-
-kernel_drivewire: $(KERNEL_DW) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW)>$@
-
-kernel_tc3: $(KERNEL_TC3) $(DEPENDS)
-	$(MERGE) $(KERNEL_TC3)>$@
-
-kernel_ide: $(KERNEL_IDE) $(DEPENDS)
-	$(MERGE) $(KERNEL_IDE)>$@
-
-# ROM image (32,768 bytes long) to burn into ROM on CoCo 3
-#bootfile_1773_rom: $(BOOTFILE_1773_ROM) $(DEPENDS) kernel_1773
-#	$(MERGE) $(BOOTFILE_1773_ROM)>$@
-#	$(PADROM) \$$6C00 $@ -c=\$$FF
-#	$(MERGE) kernel_1773>>$@
-#	$(PADROM) \$$7FF0 $@ -c=\$$FF
-#	$(MERGE) $(MD)/rom_vectors>>$@
-
-# ROM image (32,768 bytes long) to burn into ROM on CoCo 3
-#bootfile_drivewire_rom: $(BOOTFILE_ROM) $(DEPENDS) kernel_drivewire
-#	$(MERGE) $(BOOTFILE_ROM)>$@
-#	$(PADROM) \$$6C00 $@ -c=\$$FF
-#	$(MERGE) kernel_drivewire>>$@
-#	$(PADROM) \$$7FF0 $@ -c=\$$FF
-#	$(MERGE) $(MD)/rom_vectors>>$@
-
-# ROM image (32,768 bytes long) to burn into ROM on CoCo 3
-#bootfile_rom: $(BOOTFILE_ROM) $(DEPENDS) kernel_rom
-#	$(MERGE) $(BOOTFILE_ROM)>$@
-#	ls -l $@
-#	$(PADROM) \$$6C00 $@ -c=\$$FF
-#	$(MERGE) kernel_rom>>$@
-#	$(PADROM) \$$7FF0 $@ -c=\$$FF
-#	$(MERGE) $(MD)/rom_vectors>>$@
-
-clean:
-	$(RM) $(ALLOBJS)
-
--- a/level2/coco3_6309/bootfiles/makefile.cust	Fri Apr 01 20:23:11 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-include ../../rules.mak
-
-# Module directory
-MD		= ../modules
-# Commands directory
-CD		= ../cmds
-# Third Party directories
-3PB		= $(3RDPARTY)/booters
-3PM		= $(3RDPARTY)/fmgrs
-3PD		= $(3RDPARTY)/drivers
-P2D		= $(3RDPARTY)/p2mods
-
-DEPENDS		= ./makefile.cust
-
-KERNEL_1773	= $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_TC3	= $(MD)/rel_80 $(C9)/Products/SuperDrivers/software/6809l2/boot_tc3 $(MD)/krn
-KERNEL_IDE	= $(MD)/rel_80 $(MD)/boot_idelba $(MD)/krn
-KERNEL_DW	= $(MD)/rel_80 $(C9)/Products/DriveWire/software/6809l2/boot_dw $(MD)/krn
-
-# OS-9 disk bootfile to allow booting from WD1773 disk controller
-BOOTFILE_1773	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-		$(MD)/rbf.mn \
-		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
-		$(MD)/ddd0_40d.dd \
-		$(MD)/scf.mn $(MD)/cc3io.dr \
-		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-		$(MD)/windint.io \
-		$(MD)/term_win80.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft
-
-# OS-9 disk bootfile to allow booting from TC^3 SCSI controller
-# This is a custom bootfile made by Boisy for his system
-BOOTFILE_TC3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-		$(MD)/rbf.mn \
-		$(C9)/superscsi/6809l2/superscsi_tc3.dr \
-		$(C9)/superscsi/6809l2/dd_ez135_tc3.dd \
-		$(C9)/superscsi/6809l2/h5_zip100_tc3.dd \
-		$(C9)/superscsi/6809l2/c3_cdrom_tc3.dd \
-		$(C9)/superscsi/6809l2/hb_255_tc3.dd \
-		$(C9)/drivewire/6809l2/drivewire.dr \
-		$(C9)/drivewire/6809l2/x0.dd \
-		$(C9)/drivewire/6809l2/x1.dd \
-		$(C9)/drivewire/6809l2/x2.dd \
-		$(C9)/drivewire/6809l2/x3.dd \
-		$(3PD)/sdisk3/sdisk3_dmc_68.dr \
-		$(3PD)/sdisk3/d0_80d.dd $(3PD)/sdisk3/d1_40d.dd \
-		$(MD)/scf.mn $(MD)/cc3io.dr \
-		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-		$(MD)/windint.io $(MD)/vdgint_small.io \
-		$(MD)/term_win80.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-		$(MD)/vrn.dr $(MD)/nil.dd \
-		$(MD)/vi.dd $(MD)/ftdd.dd \
-		$(MD)/sc6551.dr $(MD)/t2_sc6551.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_cloud9
-
-# OS-9 disk bootfile to allow booting from TC^3 SCSI controller
-# This is a custom bootfile made by Boisy for his system
-BOOTFILE_EXP	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-		$(MD)/rbf.mn \
-		$(3PD)/sdisk3/sdisk3_dmc_63.dr \
-		$(3PD)/sdisk3/d0_80d.dd $(3PD)/sdisk3/d1_40d.dd \
-		$(MD)/scf.mn $(MD)/cc3io.dr \
-		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-		$(MD)/windint.io $(MD)/vdgint_small.io \
-		$(MD)/term_win80.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-		$(MD)/vrn.dr $(MD)/nil.dd \
-		$(MD)/vi.dd $(MD)/ftdd.dd \
-		$(MD)/sc6551.dr $(MD)/t2_sc6551.dd \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_cloud9
-#		$(C9)/products/SuperSCSI/softwarev2/6809l2/superdriver.dr \
-#		$(C9)/products/SuperSCSI/softwarev2/6809l2/lltc3.dr \
-#		$(C9)/products/SuperSCSI/softwarev2/6809l2/h5_ez135_tc3.dd \
-
-BOOTFILE_LUCKEY  = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-                $(MD)/rbf.mn \
-                $(C9)/Products/SuperDrivers/software/6809l2/rbsuper.dr \
-                $(C9)/Products/SuperDrivers/software/6809l2/llide.dr \
-                $(C9)/Products/SuperDrivers/software/6809l2/lltc3.dr \
-                $(C9)/Products/SuperDrivers/software/6809l2/dd_ide.dd \
-                $(C9)/Products/SuperDrivers/software/6809l2/i0_ide.dd \
-                $(C9)/Products/SuperDrivers/software/6809l2/ih_ide.dd \
-                $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
-                $(MD)/scf.mn $(MD)/cc3io.dr \
-                $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-                $(MD)/grfint.io \
-                $(MD)/term_win80.dt \
-                $(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-                $(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-                $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-                $(MD)/clock_60hz $(MD)/clock2_soft
-
-BOOTFILE_CUST2  = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-                $(MD)/rbf.mn \
-                $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \
-                $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x1.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x2.dd \
-                $(C9)/Products/DriveWire/software/6809l2/x3.dd \
-                $(MD)/scf.mn \
-                $(MD)/cc3io.dr \
-                $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-                $(MD)/grfint.io \
-                $(MD)/term_win80.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-                $(MD)/sc6551.dr \
-                $(MD)/t2_sc6551.dd \
-                $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-                $(MD)/clock_60hz $(MD)/clock2_soft \
-                $(C9)/Products/NitrOS-9\ ROM\ Kit/software/6809l2/sysgo_rom \
-		$(CD)/shell_21 $(CD)/devs $(CD)/deiniz $(CD)/dmem \
-		$(CD)/pmap
-                
-BOOTFILE_CUST   = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-                $(MD)/rbf.mn \
-                $(C9)/Products/DriveWire/software/6809l2/drivewire.dr \
-                $(C9)/Products/DriveWire/software/6809l2/ddx0.dd \
-                $(MD)/rammer.dr \
-                $(MD)/r0_8k.dd \
-                $(MD)/scf.mn \
-                $(MD)/sc6551.dr \
-                $(MD)/cc3io.dr \
-                $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-                $(MD)/grfint.io \
-                $(MD)/term_win80.dt \
-                $(MD)/term_sc6551.dt \
-		$(MD)/w.dw $(MD)/w1.dw $(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw \
-		$(MD)/w5.dw $(MD)/w6.dw $(MD)/w7.dw \
-		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-                $(MD)/clock_60hz \
-                $(MD)/clock2_soft \
-                $(MD)/sysgo_dd
-#                $(C9)/Products/DriveWire/software/6809l2/clock2_dw \
-
-
-BOOTFILES	= bootfile_1773 bootfile_cust
-KERNELS		= kernel_1773 kernel_tc3 kernel_drivewire
-
-ALLOBJS		= $(BOOTFILES) $(KERNELS)
-
-all:	$(ALLOBJS)
-
-bootfile_1773: $(BOOTFILE_1773) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_1773)>$@
-
-bootfile_cust: $(BOOTFILE_CUST) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_CUST)>$@
-
-# Howard Luckey's bootfile for his SuperIDE purchased on May 16, 2004
-bootfile_luckey: $(BOOTFILE_LUCKEY) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_LUCKEY)>$@
-
-kernel_1773: $(KERNEL_1773) $(DEPENDS)
-	$(MERGE) $(KERNEL_1773)>$@
-
-kernel_drivewire: $(KERNEL_DW) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW)>$@
-
-kernel_tc3: $(KERNEL_TC3) $(DEPENDS)
-	$(MERGE) $(KERNEL_TC3)>$@
-
-kernel_ide: $(KERNEL_IDE) $(DEPENDS)
-	$(MERGE) $(KERNEL_IDE)>$@
-
-# ROM image (32,768 bytes long) to burn into ROM on CoCo 3
-#bootfile_1773_rom: $(BOOTFILE_1773_ROM) $(DEPENDS) kernel_1773
-#	$(MERGE) $(BOOTFILE_1773_ROM)>$@
-#	$(PADROM) \$$6C00 $@ -c=\$$FF
-#	$(MERGE) kernel_1773>>$@
-#	$(PADROM) \$$7FF0 $@ -c=\$$FF
-#	$(MERGE) $(MD)/rom_vectors>>$@
-
-# ROM image (32,768 bytes long) to burn into ROM on CoCo 3
-#bootfile_drivewire_rom: $(BOOTFILE_ROM) $(DEPENDS) kernel_drivewire
-#	$(MERGE) $(BOOTFILE_ROM)>$@
-#	$(PADROM) \$$6C00 $@ -c=\$$FF
-#	$(MERGE) kernel_drivewire>>$@
-#	$(PADROM) \$$7FF0 $@ -c=\$$FF
-#	$(MERGE) $(MD)/rom_vectors>>$@
-
-# ROM image (32,768 bytes long) to burn into ROM on CoCo 3
-#bootfile_rom: $(BOOTFILE_ROM) $(DEPENDS) kernel_rom
-#	$(MERGE) $(BOOTFILE_ROM)>$@
-#	ls -l $@
-#	$(PADROM) \$$6C00 $@ -c=\$$FF
-#	$(MERGE) kernel_rom>>$@
-#	$(PADROM) \$$7FF0 $@ -c=\$$FF
-#	$(MERGE) $(MD)/rom_vectors>>$@
-
-clean:
-	$(RM) $(ALLOBJS)
-
--- a/level2/makefile	Fri Apr 01 20:23:11 2005 +0000
+++ b/level2/makefile	Fri Apr 01 21:19:32 2005 +0000
@@ -29,10 +29,15 @@
 
 PACKAGENAME	= $(RELEASE).zip
 DSK360K_1	= $(RELEASE)_40d_1.dsk
+LDSK360K_1	= latest_40d_1.dsk
 DSK360K_1_50HZ	= $(RELEASE)_40d_1_50hz.dsk
+LDSK360K_1_50HZ	= latest_40d_1_50hz.dsk
 DSK360K_2	= $(RELEASE)_40d_2.dsk
+LDSK360K_2	= latest_40d_2.dsk
 DSK720K		= $(RELEASE)_80d.dsk
+LDSK720K	= latest_80d.dsk
 DSK720K_50HZ	= $(RELEASE)_80d_50hz.dsk
+LDSK720K_50HZ	= latest_80d_50hz.dsk
 TESTDSK		= test.dsk
 
 
@@ -50,7 +55,9 @@
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
+	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(LDSK360K_1) $(DSK360K_1_50HZ) \
+	 $(LDSK360K_1_50HZ) $(DSK360K_2) $(LDSK360K_2)  $(DSK720K) \
+	$(LDSK720K) $(DSK720K_50HZ) $(LDSK720K_50HZ)
 
 dsk: all $(PACKAGENAME)
 
@@ -82,6 +89,8 @@
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(RM) $(LDSK360K_1)
+	$(SOFTLINK) $@ $(LDSK360K_1)
 
 $(DSK360K_1_50HZ):
 	-$(RM) $@
@@ -102,6 +111,8 @@
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(RM) $(LDSK360K_1_50HZ)
+	$(SOFTLINK) $@ $(LDSK360K_1_50HZ)
 
 $(DSK360K_2):
 	-$(RM) $@
@@ -137,6 +148,8 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
+	$(RM) $(LDSK360K_2)
+	$(SOFTLINK) $@ $(LDSK360K_2)
 
 $(DSK720K):
 	-$(RM) $@
@@ -188,6 +201,8 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
+	$(RM) $(LDSK720K)
+	$(SOFTLINK) $@ $(LDSK720K)
 
 $(DSK720K_50HZ):
 	-$(RM) $@
@@ -239,5 +254,6 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
+	$(RM) $(LDSK720K_50HZ)
+	$(SOFTLINK) $@ $(LDSK720K_50HZ)
 
-
--- a/level2/makefile.cust	Fri Apr 01 20:23:11 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-include ../rules.mak
-
-CPU		= 6809
-DISTRO		= $(CPU)L2
-RELEASE		= nos9$(CPU)l2cust
-BOOTFILE_DS80	= bootfiles/bootfile_cust
-KERNELFILE	= bootfiles/kernel_drivewire
-DIRS		= cmds modules defs sys bootfiles
-
-CMDS		= $(shell $(CD) cmds; make showobjs)
-BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
-KERNEL		= $(shell $(CD) modules; make showkernel)
-SYSMODS		= $(shell $(CD) modules; make showsysmods)
-CLOCKS		= $(shell $(CD) modules; make showclocks)
-RBF		= $(shell $(CD) modules; make showrbf)
-SCF		= $(shell $(CD) modules; make showscf)
-PIPE		= $(shell $(CD) modules; make showpipe)
-MODULECMDS	= shell grfdrv del echo format makdir merge os9gen prompt
-
-DEFS		= $(shell $(CD) defs; make showobjs)
-SYSTEXT		= $(shell $(CD) sys; make showtextobjs)
-SYSBIN		= $(shell $(CD) sys; make showbinobjs)
-ROOTFILES	= startup
-SYSGO		= sysgo_dd
-
-PACKAGENAME	= $(RELEASE).zip
-DSK720K		= $(RELEASE).dsk
-
-
-# Make all components
-all:
-	@$(ECHO) "**************************************************"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "*        NitrOS-9/$(CPU) Level 2 Distribution      *"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "**************************************************"
-	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
-	$(CD) bootfiles; make -f makefile.cust
-
-# Clean all components
-clean: dskclean
-	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
-	$(CD) bootfiles; make -f makefile.cust clean
-
-dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK720K)
-
-dsk: all $(PACKAGENAME)
-
-dskcopy: dsk
-	$(CP) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR)
-
-$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) $(DSK720K) ReadMe ChangeLog
-	$(ARCHIVE) $@ $^
-
-$(DSK360K_1):
-	-$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNELFILE)
-	$(MAKDIR) $@,CMDS
-	$(MAKDIR) $@,SYS
-	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
-	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
-	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
-	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
-	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES) $@,.
-	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
-
-$(DSK360K_2):
-	-$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 2"
-	$(MAKDIR) $@,NITROS9
-	$(MAKDIR) $@,NITROS9/$(DISTRO)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
-	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
-	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
-	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
-
-$(DSK720K):
-	-$(RM) $@
-	$(OS9FORMAT) -l32768 -q $@ -n"NitrOS-9/6809 Level 2"
-	$(OS9GEN) $@ -b=$(BOOTFILE_DS80) -t=$(KERNELFILE)
-	$(MAKDIR) $@,CMDS
-	$(MAKDIR) $@,SYS
-	$(MAKDIR) $@,DEFS
-	$(CP) modules/$(SYSGO) $@,sysgo
-	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
-	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
-	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
-	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
-	$(CPL) $(ROOTFILES) $@,.
-	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
-	$(MAKDIR) $@,NITROS9
-	$(MAKDIR) $@,NITROS9/$(DISTRO)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
-	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
-	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/CMDS/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
-	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
-	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
-	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
-	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
-	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/RBF/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
-	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/SCF/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
-	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file);)
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
-	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
-	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
-	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
-
-
--- a/rules.mak	Fri Apr 01 20:23:11 2005 +0000
+++ b/rules.mak	Fri Apr 01 21:19:32 2005 +0000
@@ -16,9 +16,14 @@
 ifndef	NITROS9DIR
 NITROS9DIR	= $(HOME)/nitros9
 endif
+ifndef	CLOUD9DIR
+CLOUD9DIR	= $(HOME)/cloud9
+endif
 ifndef	COCOTOOLSBIN
 COCOTOOLSBIN	= $(HOME)/bin
 endif
+
+C9		= $(CLOUD9DIR)
 DEFSDIR		= $(NITROS9DIR)/defs
 DSKDIR		= $(NITROS9DIR)/dsks
 
@@ -74,7 +79,6 @@
 6809L1		= $(NITROS9DIR)/6809l1
 6809L2		= $(NITROS9DIR)/6809l2
 6309L2		= $(NITROS9DIR)/6309l2
-C9		= $(HOME)/cloud9
 
 # File managers
 %.mn: %.asm
--- a/scripts/bundi	Fri Apr 01 20:23:11 2005 +0000
+++ b/scripts/bundi	Fri Apr 01 21:19:32 2005 +0000
@@ -2,7 +2,6 @@
 #
 # BUNDI - Build the Ultimate NitrOS-9 Disk Image
 #
-alias calc 'awk "BEGIN{print \!* }" '
 #
 # This script builds the ULTIMATE NitrOS-9/6309 Level 2 disk image
 # complete with HDB-DOS drives!
@@ -21,8 +20,10 @@
 
 
 set diskname=ultimate.dsk
-set os9_sectors=`calc $hdbdos_offset*2`
+set multiplier=2
+@ os9_sectors = $hdbdos_offset * $multiplier
 echo $os9_sectors
+@ hdb_drives = $num_hdbdos_disks - 2
 
 ########## PART  I ##########
 #                           #
@@ -36,8 +37,6 @@
 pushd $CLOUD9DIR/Products/HDB-DOS/Software
 make dsk
 popd
-cp $NITROS9DIR/6309l2/bootfiles/bootfile_cust .
-cp $NITROS9DIR/6309l2/bootfiles/kernel_ide .
 
 ########## PART II ##########
 #                           #
@@ -45,18 +44,17 @@
 #                           #
 #############################
 # Step 1 - Prepare the disk image
-os9 format -qe -l$os9_sectors uucp.dsk
+os9 format -qe -l$os9_sectors tmp.dsk
 ./makeboot
-os9 gen -b=bootfile -t=boottrack uucp.dsk
+os9 dsave -e $NITROS9DIR/6309l2/latest_80d.dsk, tmp.dsk,
+os9 dsave -e $NITROS9DIR/3rdparty/packages/uucpbb/uucpbb21_6309.dsk, tmp.dsk,
+os9 format -qe -ss -dd boot.dsk
+os9 gen -b=bootfile -t=boottrack boot.dsk
 rm bootfile boottrack
-os9 dsave -e $NITROS9DIR/6309l2/nos96309l2_80d.dsk, uucp.dsk,
-os9 dsave -e $NITROS9DIR/3rdparty/packages/uucpbb/uucpbb21_6309.dsk, uucp.dsk,
-os9 format -qe -ss -dd boot.dsk
-os9 gen -b=bootfile_cust -t=kernel_ide boot.dsk
-decb dskini -h`calc $num_hdbdos_disks-2` hdbdrives.dsk
+decb dskini -h$hdb_drives hdbdrives.dsk
 cat $CLOUD9DIR/Products/HDB-DOS/Software/hdbdos.dsk hdbdrives.dsk boot.dsk>hdbdrives2.dsk
 rm hdbdrives.dsk boot.dsk
 decb hdbconv hdbdrives2.dsk hdbdrives.dsk
 rm hdbdrives2.dsk
-cat uucp.dsk hdbdrives.dsk>$diskname
-rm uucp.dsk hdbdrives.dsk
+cat tmp.dsk hdbdrives.dsk>$diskname
+rm tmp.dsk hdbdrives.dsk
--- a/scripts/makeboot	Fri Apr 01 20:23:11 2005 +0000
+++ b/scripts/makeboot	Fri Apr 01 21:19:32 2005 +0000
@@ -8,6 +8,7 @@
 set tracklist_ide="$md/rel_80 $sd/boot_ide $md/krn"
 set tracklist_dw="$md/rel_80 $dd/boot_dw $md/krn"
 
+# IDE Boot with IDE Master as /DD
 set bootlist_ide="$md/krnp2 $md/ioman $md/init $md/rbf.mn $sd/rbsuper.dr $sd/llide.dr $sd/lltc3.dr $sd/dd_ide.dd $sd/i0_ide.dd $sd/i1_ide.dd $sd/ih_ide.dd $sd/s0_tc3.dd $sd/s1_tc3.dd $sd/s2_tc3.dd $sd/s3_tc3.dd $sd/s4_tc3.dd $sd/s5_tc3.dd $sd/s6_tc3.dd $sd/s7_tc3.dd $sd/sh_tc3.dd $dd/drivewire.dr $dd/x0.dd $dd/x1.dd $dd/x2.dd $dd/x3.dd $md/rb1773.dr $md/d0_80d.dd $md/d1_40d.dd $md/scf.mn $md/cc3io.dr $md/term_win80.dt $md/keydrv_cc3.sb $md/joydrv_joy.sb $md/snddrv_cc3.sb $md/grfint.io $md/w.dw $md/w1.dw $md/w2.dw $md/w3.dw $md/w4.dw $md/w5.dw $md/w6.dw $md/w7.dw $md/sc6551.dr $md/t2_sc6551.dd $md/t3_sc6551.dd $md/pipeman.mn $md/piper.dr $md/pipe.dd $md/clock_60hz $md/clock2_cloud9"
 
 #                $(C9)/Products/SuperDrivers/software/6309l2/lldw.dr \