From 8fa53bff3ca7448d91a688cbfffdd547987bc588 Mon Sep 17 00:00:00 2001 From: Greg Haerr Date: Fri, 26 Aug 2022 13:47:31 -0600 Subject: [PATCH] [build] Add PC-98 and 8018X to CI build, add space in 1440K image --- .github/workflows/main.yml | 6 ++++++ build.sh | 21 ++++++++++++++++++++- elks/init/main.c | 2 ++ elkscmd/Applications | 11 ++++++----- elkscmd/Make.install | 2 +- ibmpc-1440.config | 3 ++- pc98-1232.config | 1 + pc98-1440.config | 1 + 8 files changed, 39 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 45d996cb2..4fb30a087 100644 --- a/.github/workflows/main.yml +++ b/.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 diff --git a/build.sh b/build.sh index c878e1822..7b5320f10 100755 --- a/build.sh +++ b/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." diff --git a/elks/init/main.c b/elks/init/main.c index 85b5ff095..0c9149013 100644 --- a/elks/init/main.c +++ b/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) diff --git a/elkscmd/Applications b/elkscmd/Applications index 42c58455c..b15341aac 100644 --- a/elkscmd/Applications +++ b/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 diff --git a/elkscmd/Make.install b/elkscmd/Make.install index 86f95d06d..44dd5fddc 100644 --- a/elkscmd/Make.install +++ b/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 diff --git a/ibmpc-1440.config b/ibmpc-1440.config index fc7123a2d..a6b78d4c5 100644 --- a/ibmpc-1440.config +++ b/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 diff --git a/pc98-1232.config b/pc98-1232.config index f28d9fbdb..0a5852c77 100644 --- a/pc98-1232.config +++ b/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 diff --git a/pc98-1440.config b/pc98-1440.config index baedde3c9..87008f5cd 100644 --- a/pc98-1440.config +++ b/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