From 836e4eba09e73612b00f268e124750e78aeaa225 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Wed, 30 Oct 2019 21:18:08 +0100
Subject: Added kind of working initrd support

---
 Makefile | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9f28fbb..cbb23b0 100644
--- a/Makefile
+++ b/Makefile
@@ -40,25 +40,12 @@ build: clean
 	# Create ISO
 	mkdir -p ./iso/boot/grub; \
 	cp ./build/melvix.bin ./iso/boot/; \
-	cp ./src/kernel/grub.cfg ./iso/boot/grub/; \
+	cp ./src/bootloader/grub.cfg ./iso/boot/grub/; \
+	gcc -w ./src/bootloader/make_initrd.c -o ./build/make_initrd || exit; \
+	./build/make_initrd ./src/bootloader/test.txt test.txt || exit; \
+	mv initrd.img ./iso/boot/melvix.initrd || exit; \
 	grub-mkrescue -o ./build/melvix.iso ./iso/;
 
-image: build
-	@set -e; \
-	gcc -w ./src/utils/make_initrd.c -o ./build/make_initrd || exit; \
-	./build/make_initrd ./src/utils/test.txt test.txt || exit; \
-	mv initrd.img ./build/initrd.img || exit; \
-	dd if=/dev/zero of=./build/image.img iflag=fullblock bs=1M count=10 && sync; \
-	mkfs.ext2 ./build/image.img; \
-	device=$$(sudo losetup -f); \
-	sudo losetup $$device ./build/image.img || exit; \
-	mkdir ./build/mnt/ || exit; \
-	sudo mount $$device ./build/mnt/ || exit; \
-	sudo cp ./build/melvix.iso ./build/mnt/kernel || exit; \
-	sudo cp ./build/initrd.img ./build/mnt/initrd || exit; \
-	sudo umount $$device || exit; \
-	sudo losetup -d $$device;
-
 cross:
 	@set -e; \
 	[ -d "./cross/" ] && echo "Please remove ./cross/ and try again" && exit; \
-- 
cgit v1.2.3