# HG changeset patch # User Tormod Volden # Date 1523122133 -7200 # Node ID 4393a2b5b9a042c9a90b9695687588d4d6c614d8 # Parent 13737f3608e6a381f8117d66cc28a1b701cfbf98 Revert introduction of underscore in DISTRO folders on disks. These were inadvertently changed when we improved the disk image file names. diff -r 13737f3608e6 -r 4393a2b5b9a0 level1/atari/makefile --- a/level1/atari/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level1/atari/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -4,7 +4,7 @@ #WHICHSHELL = shellplus WHICHSHELL = shell_21 -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) BOOTFILE = bootfiles/bootfile diff -r 13737f3608e6 -r 4393a2b5b9a0 level1/coco1/makefile --- a/level1/coco1/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level1/coco1/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -4,7 +4,7 @@ #WHICHSHELL = shellplus WHICHSHELL = shell_21 -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) BOOTFILE_COVDG = bootfiles/bootfile_covdg diff -r 13737f3608e6 -r 4393a2b5b9a0 level1/corsham/makefile --- a/level1/corsham/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level1/corsham/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -4,7 +4,7 @@ #WHICHSHELL = shellplus WHICHSHELL = shell_21 -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) BOOTFILE = bootfiles/bootfile diff -r 13737f3608e6 -r 4393a2b5b9a0 level1/d64/makefile --- a/level1/d64/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level1/d64/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -52,7 +52,7 @@ #WHICHSHELL = shellplus WHICHSHELL = shell_21 -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) diff -r 13737f3608e6 -r 4393a2b5b9a0 level1/dalpha/makefile --- a/level1/dalpha/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level1/dalpha/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -52,7 +52,7 @@ #WHICHSHELL = shellplus WHICHSHELL = shell_21 -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) diff -r 13737f3608e6 -r 4393a2b5b9a0 level1/mc09/makefile --- a/level1/mc09/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level1/mc09/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -4,7 +4,7 @@ #WHICHSHELL = shellplus WHICHSHELL = shell_21 -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) # The BOOTFILE is for 80D (720K) virtual drive on SD, 50Hz timer interrupt diff -r 13737f3608e6 -r 4393a2b5b9a0 level2/coco3/makefile --- a/level2/coco3/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level2/coco3/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -1,6 +1,6 @@ include port.mak -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) BOOTFILE_DW = bootfiles/bootfile_dw diff -r 13737f3608e6 -r 4393a2b5b9a0 level2/coco3fpga/makefile --- a/level2/coco3fpga/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level2/coco3fpga/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -5,7 +5,7 @@ #WHICHSHELL = shellplus #WHICHSHELL = shell_21 -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) BOOTFILE_COCO3FPGA = bootfiles/bootfile_coco3fpga diff -r 13737f3608e6 -r 4393a2b5b9a0 level2/mc09l2/makefile --- a/level2/mc09l2/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level2/mc09l2/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -1,6 +1,6 @@ include port.mak -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) # Big BOOTFILE for 80D (720K) virtual drive on SD, 50Hz timer interrupt, extra modules and commands diff -r 13737f3608e6 -r 4393a2b5b9a0 level3/coco3/makefile --- a/level3/coco3/makefile Wed Mar 28 21:20:31 2018 -0500 +++ b/level3/coco3/makefile Sat Apr 07 19:28:53 2018 +0200 @@ -1,6 +1,6 @@ include port.mak -DISTRO = $(CPU)_L$(LEVEL) +DISTRO = $(CPU)L$(LEVEL) DISTRONAME = NOS9_$(CPU)_L$(LEVEL) DISTROVER = $(DISTRONAME)_$(NITROS9VER)_$(PORT) BOOTFILE_DW = bootfiles/bootfile_dw