From 38ccc043c12f76142feddae7e34f6920190e0932 Mon Sep 17 00:00:00 2001
From: jn <jn@ccc.ac>
Date: Wed, 1 Feb 2023 20:35:28 +0100
Subject: [PATCH 1/3] Add fox32os convenience script

It invokes the fox32 emulator with fox32os.img in the first disk slot.
---
 fox32os | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 fox32os

diff --git a/fox32os b/fox32os
new file mode 100755
index 0000000..339a766
--- /dev/null
+++ b/fox32os
@@ -0,0 +1,3 @@
+#!/bin/sh
+FOXBASE="$(dirname "$(realpath "$0")" )"/..
+"$FOXBASE"/fox32/fox32 --disk "$FOXBASE"/fox32os/fox32os.img "$@"

From c9457baa42360425c497ee90c557e04f16ef0f39 Mon Sep 17 00:00:00 2001
From: jn <jn@ccc.ac>
Date: Mon, 30 Jan 2023 20:43:59 +0100
Subject: [PATCH 2/3] Let users provide their own startup.cfg without pain

Users can now edit base_image/startup.cfg without git paying attention
to it. Typing `make` and using the default works, too.
---
 .gitignore                                      | 1 +
 Makefile                                        | 4 ++++
 base_image/{startup.cfg => startup.cfg.default} | 0
 3 files changed, 5 insertions(+)
 rename base_image/{startup.cfg => startup.cfg.default} (100%)

diff --git a/.gitignore b/.gitignore
index c5a13eb..dfb5e29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 **/icons.inc
 **/fox32os.img
 **/fox32os.img.tmp
+**/startup.cfg
diff --git a/Makefile b/Makefile
index c163847..f3729f7 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,11 @@ applications/launcher/icons.inc: applications/launcher/icons.png
 bootloader/bootloader.bin: bootloader/main.asm $(wildcard bootloader/*.asm)
 	$(FOX32ASM) $< $@
 
+base_image/startup.cfg: base_image/startup.cfg.default
+	cp $< $@
+
 FILES = \
+	base_image/startup.cfg \
 	base_image/kernel.fxf \
 	base_image/sh.fxf \
 	base_image/barclock.fxf \
diff --git a/base_image/startup.cfg b/base_image/startup.cfg.default
similarity index 100%
rename from base_image/startup.cfg
rename to base_image/startup.cfg.default

From 46f44cdf3043f0e92a6448d40eee95a3a9e5eb78 Mon Sep 17 00:00:00 2001
From: jn <jn@ccc.ac>
Date: Wed, 1 Feb 2023 20:32:17 +0100
Subject: [PATCH 3/3] Makefile: simplify fox32os.img rule

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f3729f7..4fc8774 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,6 @@ FILES = \
 	base_image/launcher.fxf
 
 fox32os.img: $(BOOTLOADER) $(FILES)
-	$(RYFS) -s $(IMAGE_SIZE) -l fox32os -b $(BOOTLOADER) create fox32os.img.tmp
-	cd base_image; for file in *; do $(RYFS) add ../fox32os.img.tmp $$file; done
-	cp fox32os.img.tmp fox32os.img
+	$(RYFS) -s $(IMAGE_SIZE) -l fox32os -b $(BOOTLOADER) create $@.tmp
+	for file in $(FILES); do $(RYFS) add $@.tmp $$file; done
+	mv $@.tmp $@