diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | docker-compose.yml | 2 |
2 files changed, 7 insertions, 2 deletions
@@ -121,13 +121,13 @@ $(LIMINE_DIR): $(EXTERNAL_DIR) echo "[yerba] cloning Limine..."; \ git clone --depth 1 --branch=$(LIMINE_BRANCH) $(LIMINE_REPO) $(LIMINE_DIR); \ fi - echo "[yerba] building Limine..." - $(MAKE) -C $(LIMINE_DIR) iso: kernel initramfs busybox rootfs $(LIMINE_DIR) @if [ -f $(ISO_PATH) ]; then \ echo "[yerba] iso already created, skipping..."; \ else \ + echo "[yerba] building Limine..."; \ + $(MAKE) -C $(LIMINE_DIR); \ echo "[yerba] bootstrapping Limine and creating ISO..."; \ mkdir -p $(ISO_ROOT)/boot/limine; \ mkdir -p $(ISO_ROOT)/EFI/BOOT; \ @@ -148,3 +148,6 @@ run: iso @echo "[yerba] booting in QEMU..." # qemu-system-x86_64 -kernel $(BUILD_DIR)/bzImage -initrd $(BUILD_DIR)/initramfs.cpio.gz -nographic -append "console=ttyS0" qemu-system-x86_64 -cdrom $(ISO_PATH) -m 2G -cpu host -enable-kvm + +setup: $(LINUX_DIR) $(LIMINE_DIR) $(BUSYBOX_DIR) + @echo "[yerba] all repos fetched" diff --git a/docker-compose.yml b/docker-compose.yml index 6b0f56c..6e7e720 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,4 +7,6 @@ services: working_dir: /yerba environment: WORKING_DIR: /yerba + ISO_ROOT: /yerba/build/iso_root command: make iso + network_mode: host |