diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po index 6c595dd7..88efab18 100644 Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ diff --git a/.Floppies/STABLE.140.po b/.Floppies/STABLE.140.po index c9721634..dc9c98df 100644 Binary files a/.Floppies/STABLE.140.po and b/.Floppies/STABLE.140.po differ diff --git a/.Floppies/STABLE.32MB.po b/.Floppies/STABLE.32MB.po index 96991f9b..2cb948b2 100644 Binary files a/.Floppies/STABLE.32MB.po and b/.Floppies/STABLE.32MB.po differ diff --git a/.Floppies/STABLE.800.po b/.Floppies/STABLE.800.po index f95c4ffe..133ffc0d 100644 Binary files a/.Floppies/STABLE.800.po and b/.Floppies/STABLE.800.po differ diff --git a/MAKE/COPYBUILD.txt b/MAKE/COPYBUILD.txt index 6c706e27..39e0ec84 100644 --- a/MAKE/COPYBUILD.txt +++ b/MAKE/COPYBUILD.txt @@ -49,6 +49,14 @@ MD /MAKE/BUILDS/BUILD${B} ECHO "\nCopying Files..." cp -Q -R /A2OSX.BUILD/* /MAKE/BUILDS/BUILD${B} ECHO "\nBUILD $B Copied!" +cd /MAKE/BUILDS/BUILD${B} +pakme PRODOS.FX PRODOS.FX.PAKED +cp PRODOS.FX* /MAKE +cd sys +md km +cp km* km +pakme kernel kernel.PAKED +echo "Fixed Up Files to make images" ECHO "PREFIX BUILDS/BUILD${B}" > /MAKE/BLEED ECHO "-A2OSX.SYSTEM" >> /MAKE/BLEED ECHO "BLEED file updated! Process Complete. Exiting.\n" diff --git a/MAKE/FULLFILES.txt b/MAKE/FULLFILES.txt index 30fa7009..e430067d 100644 --- a/MAKE/FULLFILES.txt +++ b/MAKE/FULLFILES.txt @@ -69,6 +69,7 @@ bin/wc bin/who drv/dhgr.drv drv/lancegs.drv +drv/pppssc.drv drv/ssc.drv drv/ssc.i.drv drv/uther2.ai.drv @@ -80,6 +81,7 @@ etc/init etc/issue etc/motd etc/network +etc/ppp.conf inc/a2osx.i inc/applesoft.i inc/appletalk.i @@ -115,6 +117,7 @@ inc/nic.w5100.i inc/pak.i inc/zp.i lib/libblkdev +lib/libcifs lib/libpak lib/libtcpip root/helloworld.f @@ -125,6 +128,7 @@ root/netd root/netd2 root/tsh root/tcsh +sbin/cifsd sbin/getty sbin/gui sbin/httpd diff --git a/MAKE/M2CPPPFILES.txt b/MAKE/M2CPPPFILES.txt new file mode 100644 index 00000000..50a0b0bf --- /dev/null +++ b/MAKE/M2CPPPFILES.txt @@ -0,0 +1,48 @@ +NEW + PREFIX +AUTO 4,1 +bin/cat +bin/chtyp +bin/cp +bin/cut +bin/dnsinfo +bin/edit +bin/grep +bin/httpget +bin/ipconfig +bin/kconfig +bin/kill +bin/ls +bin/lsdev +bin/lsof +bin/md5 +bin/mem +bin/mkdir +bin/more +bin/mv +bin/ping +bin/ps +bin/rm +bin/sh +bin/shutdown +bin/telnet +bin/term +drv/pppssc.drv +drv/ssc.drv +drv/ssc.i.drv +etc/init +etc/issue +etc/motd +etc/network +etc/ppp.conf +lib/libblkdev +lib/libtcpip +sbin/getty +sbin/initd +sbin/insdrv +sbin/login +sbin/networkd +sbin/telnetd +sys/km.vsdrive +MAN +TEXT /MAKE/USR/SHARE/MAKE/M2CPPPFILES diff --git a/MAKE/MAKE2C.txt b/MAKE/MAKE2C.txt new file mode 100644 index 00000000..cea6e304 --- /dev/null +++ b/MAKE/MAKE2C.txt @@ -0,0 +1,95 @@ +NEW + PREFIX +AUTO 4,1 +#!/bin/sh +# +# This script makes a proper mini2cpppboot (140K) disk using the files +# found in a particular BUILD stored in /make/builds +# +. makefuncs +CALL CS +CALL TBOX "mini2cppp (140K Floppy) Media Creator" +CALL PRINTXY 8 0 "You must have the correct 140K image mounted on /dev/s6d1" +ECHO "\n" +READ -P "Do you want to proceed (Y/N)? " P +SWITCH $P + CASE Y + CASE y + ECHO + BREAK + DEFAULT + ECHO "\n\nExiting.\n" + EXIT +END +ECHO +READ -P "WHICH BUILD NO: " B +IF [ -Z $B ] + ECHO "You did not enter any response." + ECHO + ECHO "Exiting" + EXIT +FI +SET SRC = "/MAKE/BUILDS/BUILD${B}" +IF [ -D ${SRC} ] + ECHO "\n\nFound Valid BUILD\n" +ELSE + ECHO "\n\nValid BUILD not found." + ECHO + ECHO "Exiting" + EXIT +FI +ECHO "Is this a (R)elease, (C)andidate or (S)table Build\n" +READ -P "ENTER R C or S: " RCS +IF [ -Z $RCS ] + ECHO "You did not enter any response." + ECHO + ECHO "Exiting" + EXIT +FI +SWITCH $RCS + CASE r + CASE R + SET IM = "Release Build No. ${B}" + BREAK + CASE c + CASE C + SET IM = "Release Candidate Build No. ${B}" + BREAK + CASE s + CASE S + SET IM = "Stable Release Build No. ${B}" + BREAK + DEFAULT + ECHO "You did not enter a valid response." + ECHO "You must enter only one of the characters R C or S!" + ECHO + ECHO "Exiting" + EXIT +END +ECHO "\n\nFormatting Destination..." +#format -1 s6d1 PPPBOOT +ECHO "Making Directory Structure..." +format s6d1 -1 PPPBOOT +cp -Q -Y ${SRC}/PRODOS.FX.PAKED /PPPBOOT/ProDOS +cp -Q -Y ${SRC}/A2OSX.SYSTEM /PPPBOOT/A2OSX.SYSTEM +md /PPPBOOT/bin +md /PPPBOOT/drv +md /PPPBOOT/etc +md /PPPBOOT/lib +md /PPPBOOT/root +md /PPPBOOT/sbin +md /PPPBOOT/sys +ECHO "Copying Files..." +FOR FILE IN (m2cpppfiles) + cp -Q -Y ${SRC}/${FILE} /PPPBOOT/${FILE} +NEXT +cp -Q -Y ${SRC}/sys/kernel.PAKED /PPPBOOT/sys/kernel +cp -Q -Y initboot /PPPBOOT/etc/init +ECHO "Welcome to A2osX!" > /PPPBOOT/etc/issue +ECHO >> /PPPBOOT/etc/issue +ECHO $IM >> /PPPBOOT/etc/issue +cp -Q tcpip.conf /PPPBOOT/etc/tcpip.conf +cp -Q profile /PPPBOOT/root/profile +ECHO "PPPBOOT Disk Created!" +MAN +TEXT /MAKE/USR/SHARE/MAKE/MAKEM2C diff --git a/MAKE/MAKEMINI.txt b/MAKE/MAKEMINI.txt index 0edeb6ab..e4f90ec3 100644 --- a/MAKE/MAKEMINI.txt +++ b/MAKE/MAKEMINI.txt @@ -3,12 +3,12 @@ NEW AUTO 4,1 #!/bin/sh # -# This script makes a proper miniboot (140K) disk using the files +# This script makes a proper MINIBOOT (140K) disk using the files # found in a particular BUILD stored in /make/builds # . makefuncs CALL CS -CALL TBOX "miniboot (140K Floppy) Media Creator" +CALL TBOX "MINIBOOT (140K Floppy) Media Creator" CALL PRINTXY 8 0 "You must have the correct 140K image mounted on /dev/s6d1" ECHO "\n" READ -P "Do you want to proceed (Y/N)? " P @@ -67,27 +67,29 @@ SWITCH $RCS EXIT END ECHO "\n\nFormatting Destination..." -format -1 s6d1 miniboot +#format -1 s6d1 MINIBOOT ECHO "Making Directory Structure..." -md /miniboot/bin -md /miniboot/drv -md /miniboot/etc -md /miniboot/lib -md /miniboot/root -md /miniboot/sbin -md /miniboot/sys +format s6d1 -1 MINIBOOT +cp -Q -Y ${SRC}/PRODOS.FX.PAKED /MINIBOOT/ProDOS +cp -Q -Y ${SRC}/A2OSX.SYSTEM /MINIBOOT/A2OSX.SYSTEM +md /MINIBOOT/bin +md /MINIBOOT/drv +md /MINIBOOT/etc +md /MINIBOOT/lib +md /MINIBOOT/root +md /MINIBOOT/sbin +md /MINIBOOT/sys ECHO "Copying Files..." FOR FILE IN (minifiles) - cp -Q -Y ${SRC}/${FILE} /miniboot/${FILE} + cp -Q -Y ${SRC}/${FILE} /MINIBOOT/${FILE} NEXT -cp -Q -Y ${SRC}/PRODOS.FX.PAKED /miniboot/ProDOS -cp -Q -Y ${SRC}/sys/kernel.PAKED /miniboot/sys/kernel -cp -Q -Y initboot /miniboot/etc/init -ECHO "Welcome to A2osX!" > /miniboot/etc/issue -ECHO >> /miniboot/etc/issue -ECHO $IM >> /miniboot/etc/issue -cp -Q tcpip.conf /miniboot/etc/tcpip.conf -cp -Q profile /miniboot/root/profile -ECHO "miniboot Disk Created!" +cp -Q -Y ${SRC}/sys/kernel.PAKED /MINIBOOT/sys/kernel +cp -Q -Y initboot /MINIBOOT/etc/init +ECHO "Welcome to A2osX!" > /MINIBOOT/etc/issue +ECHO >> /MINIBOOT/etc/issue +ECHO $IM >> /MINIBOOT/etc/issue +cp -Q tcpip.conf /MINIBOOT/etc/tcpip.conf +cp -Q profile /MINIBOOT/root/profile +ECHO "MINIBOOT Disk Created!" MAN TEXT /MAKE/USR/SHARE/MAKE/MAKEMINI diff --git a/MAKE/MINIFILES.txt b/MAKE/MINIFILES.txt index b663d658..014f99bc 100644 --- a/MAKE/MINIFILES.txt +++ b/MAKE/MINIFILES.txt @@ -1,7 +1,6 @@ NEW PREFIX AUTO 4,1 -A2OSX.SYSTEM bin/cat bin/chtyp bin/cp diff --git a/MAKE/NETINSTFILES.txt b/MAKE/NETINSTFILES.txt index cabdb758..0385427b 100644 --- a/MAKE/NETINSTFILES.txt +++ b/MAKE/NETINSTFILES.txt @@ -2,7 +2,6 @@ NEW PREFIX AUTO 4,1 A2osX.logo -A2OSX.SYSTEM bin/cat bin/cp bin/cut diff --git a/MAKE/UPDATEFILES.txt b/MAKE/UPDATEFILES.txt index 36e62c92..f313d452 100644 --- a/MAKE/UPDATEFILES.txt +++ b/MAKE/UPDATEFILES.txt @@ -69,6 +69,7 @@ bin/wc bin/who drv/dhgr.drv drv/lancegs.drv +drv/pppssc.drv drv/ssc.drv drv/ssc.i.drv drv/uther2.ai.drv @@ -109,8 +110,10 @@ inc/nic.w5100.i inc/pak.i inc/zp.i lib/libblkdev +lib/libcifs lib/libpak lib/libtcpip +sbin/cifsd sbin/getty sbin/gui sbin/httpd