From 690355395ce9c962fc00cffa51e5bede70cb435d Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Fri, 14 Oct 2022 20:20:32 -0700 Subject: [PATCH] getting there --- README.md | 33 +++++++++++++++++-- build-all | 8 ++--- cosmo-all/Dockerfile | 5 +-- cosmo-bootstrap/Dockerfile | 2 +- cosmo-dist/Dockerfile | 1 + .../{awk.Dockerfile => cosmo-awk.Dockerfile} | 0 ...js.Dockerfile => cosmo-quickjs.Dockerfile} | 0 .../{sed.Dockerfile => cosmo-sed.Dockerfile} | 0 8 files changed, 40 insertions(+), 9 deletions(-) rename simple/{awk.Dockerfile => cosmo-awk.Dockerfile} (100%) rename simple/{quickjs.Dockerfile => cosmo-quickjs.Dockerfile} (100%) rename simple/{sed.Dockerfile => cosmo-sed.Dockerfile} (100%) diff --git a/README.md b/README.md index d6b1646..952ebb5 100644 --- a/README.md +++ b/README.md @@ -51,10 +51,15 @@ with some minor patches and a custom distrib. * **assimilate:** converts Actually Portable Executables into native binaries. typically unnecessary, but sometimes nice. + * **bd:** (TODO) + + * **bing:** (TODO) + + * **blinkenlights:** (TODO) + * **cosmo-awk:** Actually Portable awk (fork of One True Awk) - * **cosmo-base:** combines cosmo-dist, cosmo-assimilate, cosmo-awk, - and cosmo-sed. this is used for building other containers. + * **cosmo-base:** used to build other containers in phase 5. * **cosmo-chibicc:** chibicc (not sure which commit this is forked from) with many extensions. @@ -71,8 +76,32 @@ with some minor patches and a custom distrib. * **cosmo-sqlite:** sqlite3 (3350500) binaries and libraries. + * **fold:** (TODO) + + * **greenbean:** (TODO) + + * **hello:** (TODO) + + * **life:** (TODO) + + * **memzoom:** (TODO) + + * **mkdeps:** (TODO) + + * **pledge:** (TODO) + + * **printimage:** (TODO) + + * **printvideo:** (TODO) + + * **redbean:** (TODO) + + * **tinyemu:** (TODO) + * **unbourne:** a fork of dash (v0.5.11.5) with extended interactivity. + * **unveil:** (TODO) + ### Phase 5 * **cosmo-kuroko**: kuroko (bleeding edge), a dialect of Python 3. diff --git a/build-all b/build-all index 707e03e..a79a6cc 100755 --- a/build-all +++ b/build-all @@ -40,7 +40,7 @@ build_simple() { : \ && for f in simple/*.Dockerfile \ ;do : \ && t="${f%.*}" t=${t##*/} \ - && announce '(simple) packaging)' "$t" \ + && announce '(simple) packaging' "$t" \ && podman build -t "$t" -f "$f" simple \ || return \ ;done \ @@ -78,14 +78,16 @@ build_simple() { : \ /bin/yices.com \ \ && dbg_retrieve assimilate /bin/assimilate.com \ - && dbg_retrieve awk /bin/awk.com \ && dbg_retrieve bd /bin/bd.com \ && dbg_retrieve bing /bin/bing.com /bin/unbing.com \ && dbg_retrieve blinkenlights /bin/blinkenlights.com \ + && dbg_retrieve cosmo-awk /bin/awk.com \ && dbg_retrieve cosmo-chibicc /bin/chibicc.com \ && dbg_retrieve cosmo-lua /bin/lua.com /bin/luac.com \ && dbg_retrieve cosmo-make /bin/make.com \ && dbg_retrieve cosmo-python /bin/python.com \ + && dbg_retrieve cosmo-quickjs /bin/qjs.com /bin/qjsc.com \ + && dbg_retrieve cosmo-sed /bin/sed.com \ && dbg_retrieve cosmo-sqlite /bin/sqlite3.com \ && dbg_retrieve fold /bin/fold.com \ && dbg_retrieve greenbean /bin/greenbean.com \ @@ -96,9 +98,7 @@ build_simple() { : \ && dbg_retrieve pledge /bin/pledge.com \ && dbg_retrieve printimage /bin/printimage.com \ && dbg_retrieve printvideo /bin/printvideo.com \ - && dbg_retrieve quickjs /bin/qjs.com /bin/qjsc.com \ && dbg_retrieve redbean /bin/redbean.com \ - && dbg_retrieve sed /bin/sed.com \ && dbg_retrieve tinyemu /bin/tinyemu.com \ && dbg_retrieve unbourne /bin/unbourne.com \ && dbg_retrieve unveil /bin/unveil.com \ diff --git a/cosmo-all/Dockerfile b/cosmo-all/Dockerfile index 2c59d16..c32e3ae 100644 --- a/cosmo-all/Dockerfile +++ b/cosmo-all/Dockerfile @@ -27,8 +27,9 @@ RUN --mount=type=cache,id=cosmo-build-all,target=/cosmopolitan/o,sharing=locked ;fi \ \ # skip some checks that are currently failing: \ - && touch o//test/libc/calls/getgroups_test.com.runs \ - && touch o//test/libc/calls/getpriority_test.com.runs \ + && mkdir -p "o/$mode/test/libc/calls" \ + && touch -d '@2222222222' "o/$mode/test/libc/calls/getgroups_test.com.runs" \ + && touch -d '@2222222222' "o/$mode/test/libc/calls/getpriority_test.com.runs" \ \ && ./makeit MODE="$mode" all \ \ diff --git a/cosmo-bootstrap/Dockerfile b/cosmo-bootstrap/Dockerfile index eb741f0..e3eb25d 100644 --- a/cosmo-bootstrap/Dockerfile +++ b/cosmo-bootstrap/Dockerfile @@ -21,7 +21,7 @@ WORKDIR /cosmopolitan ENV V=0 COLUMNS=80 TMPDIR=/tmp COPY --chmod=0755 make.com build/bootstrap/make.com -COPY --chmod=0755 --from=localhost/notwa-util /nu/ /usr/bin/ +COPY --chmod=0755 --from=localhost/notwa-util /nu/shed /usr/bin/ RUN : \ # allow optimized builds to be more portable, so the container is too. \ && shed build/config.mk 's/-march=native/-march=haswell -mno-pclmul -mtune=generic/' \ diff --git a/cosmo-dist/Dockerfile b/cosmo-dist/Dockerfile index 233e3bb..94b59e8 100644 --- a/cosmo-dist/Dockerfile +++ b/cosmo-dist/Dockerfile @@ -22,6 +22,7 @@ RUN : \ ; # install the rest +COPY --chmod=0755 --from=localhost/notwa-util /nu/dedupe /usr/bin/ FROM builder AS distrib RUN --mount=type=tmpfs,target=/tmp : \ && . ./env \ diff --git a/simple/awk.Dockerfile b/simple/cosmo-awk.Dockerfile similarity index 100% rename from simple/awk.Dockerfile rename to simple/cosmo-awk.Dockerfile diff --git a/simple/quickjs.Dockerfile b/simple/cosmo-quickjs.Dockerfile similarity index 100% rename from simple/quickjs.Dockerfile rename to simple/cosmo-quickjs.Dockerfile diff --git a/simple/sed.Dockerfile b/simple/cosmo-sed.Dockerfile similarity index 100% rename from simple/sed.Dockerfile rename to simple/cosmo-sed.Dockerfile