diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2021-03-03 22:09:50 -0800 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2021-03-03 22:21:03 -0800 |
commit | 71e4f3812982dba2efb471283d310224e8db363e (patch) | |
tree | ea111a1acb8b8845dbda39c0e1b4bac1d198143b /tools/iso/soso | |
parent | c6b928be29ac8cdb4e4d6e1eaa20420ff03e5a4c (diff) | |
download | mu-71e4f3812982dba2efb471283d310224e8db363e.tar.gz |
7842 - new directory organization
Baremetal is now the default build target and therefore has its sources at the top-level. Baremetal programs build using the phase-2 Mu toolchain that requires a Linux kernel. This phase-2 codebase which used to be at the top-level is now under the linux/ directory. Finally, the phase-2 toolchain, while self-hosting, has a way to bootstrap from a C implementation, which is now stored in linux/bootstrap. The bootstrap C implementation uses some literate programming tools that are now in linux/bootstrap/tools. So the whole thing has gotten inverted. Each directory should build one artifact and include the main sources (along with standard library). Tools used for building it are relegated to sub-directories, even though those tools are often useful in their own right, and have had lots of interesting programs written using them. A couple of things have gotten dropped in this process: - I had old ways to run on just a Linux kernel, or with a Soso kernel. No more. - I had some old tooling for running a single test at the cursor. I haven't used that lately. Maybe I'll bring it back one day. The reorg isn't done yet. Still to do: - redo documentation everywhere. All the README files, all other markdown, particularly vocabulary.md. - clean up how-to-run comments at the start of programs everywhere - rethink what to do with the html/ directory. Do we even want to keep supporting it? In spite of these shortcomings, all the scripts at the top-level, linux/ and linux/bootstrap are working. The names of the scripts also feel reasonable. This is a good milestone to take stock at.
Diffstat (limited to 'tools/iso/soso')
-rwxr-xr-x | tools/iso/soso | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/tools/iso/soso b/tools/iso/soso deleted file mode 100755 index a5f4a3ab..00000000 --- a/tools/iso/soso +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# Build one or more .subx files into an ELF binary, and package it up into a -# bootable ISO image with a Soso (https://github.com/ozkl/soso) kernel. -# -# Must be run on Linux, and from the top-level mu/ directory. Will ask for -# `sudo` privileges at a couple of points. -# -# Soso is published under the 2-clause BSD license. - -set -e - -if [ $# -ne 1 ] -then - echo "Usage: `basename $0` <elf file>" - exit 1 -fi - -echo "=== constructing initramfs out of SubX binary" -dd if=/dev/zero of=initrd.fat bs=8M count=1 -LOOP=`losetup -f` -sudo losetup $LOOP initrd.fat -sudo mkfs.vfat $LOOP -sudo mount $LOOP /mnt -sudo cp $1 /mnt/init -sudo umount /mnt -sudo losetup -d $LOOP -sync -chown $SUDO_USER:$SUDO_USER initrd.fat - -echo "=== building soso kernel" -( cd tools/iso/kernel.soso - make -) - -echo "=== generating mu_soso.iso" -mkdir -p outfs/boot/grub -cp tools/iso/kernel.soso/grub.cfg outfs/boot/grub -cp tools/iso/kernel.soso/kernel.bin outfs/boot/ -cp initrd.fat outfs/boot/ -grub-mkrescue -o mu_soso.iso outfs |