vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add build system ISO generation and QEMU improvements

Browse Source 
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
Vasilito
2026-04-18 00:48:58 +01:00
parent 0997dbbbb5
commit 4f814f2024
5 changed files with 80 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mk/disk.mk
+48 -7
View File
@@ -17,21 +17,62 @@ else
mv $@.partial $@
endif
$(BUILD)/redbear-live.iso: $(FSTOOLS) $(REPO_TAG) redbear.ipxe
$(LIVE_IMG): $(FSTOOLS) $(REPO_TAG)
ifeq ($(FSTOOLS_IN_PODMAN),1)
$(PODMAN_RUN) make $@
else
mkdir -p $(BUILD)
mkdir -p $(LIVE_BUILD)
rm -rf $@ $@.partial
-$(FUMOUNT) /tmp/redox_installer || true
FILESYSTEM_SIZE=$(FILESYSTEM_SIZE) && \
if [ -z "$$FILESYSTEM_SIZE" ] ; then \
FILESYSTEM_SIZE=$(shell $(INSTALLER) --filesystem-size -c $(FILESYSTEM_CONFIG)); \
FILESYSTEM_SIZE=$(shell $(INSTALLER) --filesystem-size -c $(FILESYSTEM_CONFIG)); \
fi && \
truncate -s "$$FILESYSTEM_SIZE"m $@.partial
umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial
umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(LIVE_BOOTLOADER)" --live $@.partial
mv $@.partial $@
cp redbear.ipxe $(BUILD)/redbear.ipxe
endif
$(LIVE_ISO): $(LIVE_IMG) redbear.ipxe
ifeq ($(FSTOOLS_IN_PODMAN),1)
$(PODMAN_RUN) make $@
else
mkdir -p $(LIVE_BUILD)
rm -rf $@ $@.partial
tmpdir="$$(mktemp -d)"; \
esp_img="$$tmpdir/efiboot.img"; \
trap 'rm -rf "$$tmpdir"' EXIT; \
mkdir -p "$$tmpdir/EFI/BOOT"; \
BOOTLOADER_LIVE_BIOS=""; \
for path in recipes/core/bootloader/target/*/stage/usr/lib/boot/bootloader-live.bios repo/*/*/bootloader/*/usr/lib/boot/bootloader-live.bios; do \
if [ -f "$$path" ]; then \
BOOTLOADER_LIVE_BIOS="$$path"; \
break; \
fi; \
done; \
live_size="$$(stat -c%s "$(LIVE_IMG)")"; \
esp_size="$$((live_size + 64 * 1024 * 1024))"; \
truncate -s "$$esp_size" "$$esp_img"; \
mkfs.fat -F 32 "$$esp_img" >/dev/null; \
python3 local/scripts/fat_tool.py mkdir "$$esp_img" 0 EFI; \
python3 local/scripts/fat_tool.py mkdir "$$esp_img" 0 EFI/BOOT; \
python3 local/scripts/fat_tool.py cp-in "$$esp_img" 0 "$(LIVE_BOOTLOADER)" EFI/BOOT/BOOTX64.EFI; \
python3 local/scripts/fat_tool.py cp-in "$$esp_img" 0 "$(LIVE_IMG)" redox-live.iso; \
cp "$(LIVE_BOOTLOADER)" "$$tmpdir/EFI/BOOT/BOOTX64.EFI"; \
cp redbear.ipxe "$$tmpdir/redbear.ipxe"; \
if [ -n "$$BOOTLOADER_LIVE_BIOS" ]; then \
cp "$$BOOTLOADER_LIVE_BIOS" "$$tmpdir/bootloader-live.bios"; \
xorriso -as mkisofs -R -J -V "REDBEARLIVE" -o $@.partial \
-b bootloader-live.bios -no-emul-boot \
-eltorito-alt-boot -e efiboot.img -no-emul-boot \
"$$tmpdir" >/dev/null; \
else \
xorriso -as mkisofs -R -J -V "REDBEARLIVE" -o $@.partial \
-eltorito-alt-boot -e efiboot.img -no-emul-boot \
"$$tmpdir" >/dev/null; \
fi
mv $@.partial $@
cp redbear.ipxe $(LIVE_IPXE)
endif
$(BUILD)/filesystem.img: $(FSTOOLS) $(REPO_TAG)
@@ -84,9 +125,9 @@ ifeq ($(FSTOOLS_IN_PODMAN),1)
$(PODMAN_RUN) make $@
else
@mkdir -p $(MOUNT_DIR)
$(REDOXFS) $(BUILD)/redbear-live.iso $(MOUNT_DIR)
$(REDOXFS) $(LIVE_IMG) $(MOUNT_DIR)
@sleep 2
@echo "\033[1;36;49mredbear-live.iso mounted ($$(pgrep redoxfs))\033[0m"
@echo "\033[1;36;49m$(notdir $(LIVE_IMG)) mounted ($$(pgrep redoxfs))\033[0m"
endif
unmount: FORCE