[build] Add PC-98 and 8018X to CI build, add space in 1440K image

.github/workflows/main.yml

@@ -131,3 +131,9 @@ jobs:
         with:
           name: hd32mbr-fat.img
           path: image/hd32mbr-fat.img
+
+      - name: upload16
+        uses: actions/upload-artifact@v1
+        with:
+          name: hd64-minix.img
+          path: image/hd64-minix.img

build.sh

@@ -52,7 +52,7 @@ if [ "$1" != "auto" ]; then
 	make clean || clean_exit 4
 	fi
 
-# Build kernel, user land and image
+# Build default kernel, user land and image
 # Forcing single threaded build because of dirty dependencies (see #273)
 
 echo "Building all..."
@@ -67,6 +67,25 @@ if [ "$2" = "allimages" ]; then
 	cd ..
 fi
 
+# Build 8018X kernel and image
+if [ "$1" = "auto" ]; then
+	echo "Building 8018X image..."
+    cp 8018x.config .config
+    make kclean || clean_exit 7
+    make -j1 || clean_exit 8
+fi
+
+# Build PC-98 kernel, some user land files and image
+if [ "$1" = "auto" ]; then
+	echo "Building PC-98 image..."
+    cp pc98-1232.config .config
+    make kclean || clean_exit 9
+    rm elkscmd/sys_utils/clock.o
+    rm elkscmd/basic/*.o
+    rm elkscmd/nano-X/*.o
+    make -j1 || clean_exit 10
+fi
+
 # Success
 
 echo "Target image is in 'image' folder."

elks/init/main.c

@@ -291,6 +291,7 @@ static int INITPROC parse_dev(char * line)
 
 static void comirq(char *line)
 {
+#ifdef CONFIG_ARCH_IBMPC
 	int i;
 	char *l, *m, c;
 
@@ -306,6 +307,7 @@ static void comirq(char *line)
 		if (!c) break;
 		l++;
 	}
+#endif
 }
 
 static void parse_nic(char *line, struct netif_parms *parms)

elkscmd/Applications

@@ -74,6 +74,7 @@ file_utils/ln					:fileutil			:720k
 file_utils/ls					:fileutil		:360k   :128k
 file_utils/rm					:fileutil		:360k
 file_utils/rmdir				:fileutil		:360k
+file_utils/split				:fileutil		         :1200k
 file_utils/sync					:fileutil		:360k
 file_utils/touch				:fileutil			:720k
 sys_utils/chmem					:sysutil			:720k
@@ -189,14 +190,14 @@ inet/urlget/urlget :::httpget	:net
 #mtools/mren					:mtools					:1440k
 #mtools/mtype					:mtools					:1440k
 #mtools/mwrite					:mtools					:1440k
-bc/bc							:other					:1440k
+bc/bc							:other
 #m4/m4							:other					:1440k
 #prems/pres/pres				:other
 #nano/nano-2.0.6/src/nano		:other					:1440k
 #nano-X/bin/nxclock				:nanox					:1440k
 #nano-X/bin/nxdemo				:nanox					:1440k
-nano-X/bin/nxlandmine			:nanox					:1200k	:1440k
+nano-X/bin/nxlandmine			:nanox				:1200k
 nano-X/bin/nxterm				:nanox
-nano-X/bin/nxworld				:nanox					:1440k
-nano-X/bin/nxworld.map	::lib/nxworld.map	:nanox		:1440k
-basic/basic						:basic					:1200k
+nano-X/bin/nxworld				:nanox
+nano-X/bin/nxworld.map	::lib/nxworld.map	:nanox
+basic/basic						:basic				:1200k

elkscmd/Make.install

@@ -144,7 +144,7 @@ ifdef CONFIG_APPS_1200K
 endif
 
 ifdef CONFIG_APPS_1232K
-	TAGS = :boot|:360k|:net|:720k|
+	TAGS = :boot|:360k|:net|:720k|:1200k|
 endif
 
 ifdef CONFIG_APPS_1440K

ibmpc-1440.config

@@ -150,10 +150,11 @@ CONFIG_APP_MINIX1=y
 CONFIG_APP_MINIX2=y
 CONFIG_APP_MINIX3=y
 CONFIG_APP_MISC_UTILS=y
+CONFIG_APP_TUI=y
 # CONFIG_APP_MTOOLS is not set
 CONFIG_APP_NANOX=y
 CONFIG_APP_BASIC=y
-CONFIG_APP_OTHER=y
+# CONFIG_APP_OTHER is not set
 # CONFIG_APP_BYACC is not set
 # CONFIG_APP_M4 is not set
 # CONFIG_APP_TEST is not set

pc98-1232.config

@@ -138,6 +138,7 @@ CONFIG_APP_MINIX1=y
 # CONFIG_APP_MINIX2 is not set
 # CONFIG_APP_MINIX3 is not set
 CONFIG_APP_MISC_UTILS=y
+# CONFIG_APP_TUI is not set
 # CONFIG_APP_MTOOLS is not set
 # CONFIG_APP_NANOX is not set
 CONFIG_APP_BASIC=y

pc98-1440.config

@@ -138,6 +138,7 @@ CONFIG_APP_MINIX1=y
 # CONFIG_APP_MINIX2 is not set
 # CONFIG_APP_MINIX3 is not set
 CONFIG_APP_MISC_UTILS=y
+CONFIG_APP_TUI=y
 # CONFIG_APP_MTOOLS is not set
 # CONFIG_APP_NANOX is not set
 CONFIG_APP_BASIC=y