diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-10-18 23:11:55 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-10-18 23:11:55 -0700 |
| commit | 3a2d36a93680f2e9eb2bd2a324e4fd83eda2cfdf (patch) | |
| tree | 55be16223aed0189955fbff5fac635455033f199 | |
| parent | 469a1a9ace9b290658beb9d0799b58ce3bc2a4b4 (diff) | |
| download | mu-3a2d36a93680f2e9eb2bd2a324e4fd83eda2cfdf.tar.gz | |
5703
Fix https://github.com/akkartik/mu/issues/38: gen_soso_iso on Arch Linux. Also deemphasize bootable disk images in the Readme since that side's less mature.
| -rw-r--r-- | Readme.md | 18 | ||||
| -rw-r--r-- | kernel.soso/Makefile | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/Readme.md b/Readme.md index 0940d42e..c75ed72b 100644 --- a/Readme.md +++ b/Readme.md @@ -10,12 +10,7 @@ Running the code you want to run, and nothing else. ```sh $ git clone https://github.com/akkartik/mu $ cd mu - # package up a "hello world" program with a third-party kernel into mu_soso.iso - # requires sudo - $ ./gen_soso_iso init.soso examples/ex6.subx - # try it out - $ qemu-system-i386 -cdrom mu_soso.iso - # print the message + $ ./subx ``` [](https://travis-ci.org/akkartik/mu) @@ -138,12 +133,17 @@ Or, running in a VM on other platforms: 42 ``` -As described at the start, you can package up SubX binaries with the minimal -hobbyist OS [Soso](https://github.com/ozkl/soso) and run them on Qemu. -(Requires graphics and sudo access. Currently doesn't work on a cloud server.) +You can package up SubX binaries with the minimal hobbyist OS [Soso](https://github.com/ozkl/soso) +and run them on Qemu. (Requires graphics and sudo access. Currently doesn't +work on a cloud server.) ```sh + # dependencies + $ sudo apt install util-linux nasm xorriso # maybe also dosfstools and mtools + # package up a "hello world" program with a third-party kernel into mu_soso.iso + # requires sudo $ ./gen_soso_iso init.soso examples/ex6.subx + # try it out $ qemu-system-i386 -cdrom mu_soso.iso ``` diff --git a/kernel.soso/Makefile b/kernel.soso/Makefile index 3826b0e9..d9f4210a 100644 --- a/kernel.soso/Makefile +++ b/kernel.soso/Makefile @@ -1,6 +1,8 @@ CC=cc LD=ld -CFLAGS=-nostdlib -nostdinc -fno-builtin -m32 -c +# disable stack-protector to support Arch Linux +# (https://bugs.archlinux.org/task/18864) +CFLAGS=-nostdlib -nostdinc -fno-builtin -fno-stack-protector -m32 -c LDFLAGS=-Tlink.ld -m elf_i386 ASFLAGS=-felf |