Added file reading via filehandlers. Added support for directories. Processes are now created using filehandlers.
This commit is contained in:
@@ -2,7 +2,7 @@ CFLAGS = -g -std=gnu11 -m32 -mgeneral-regs-only -nostdlib -fno-builtin -fno-exce
|
||||
CXXFLAGS = -g -m32 -fno-use-cxa-atexit -mgeneral-regs-only -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-leading-underscore -fpermissive -fno-pie -fno-stack-protector -I.
|
||||
LDFLAGS =
|
||||
|
||||
DISK_IMG_FILES = build/kernel/kernel.bin build/world/world.bin hello.txt alpha.txt \
|
||||
DISK_IMG_FILES = build/kernel/kernel.bin hello.txt alpha.txt \
|
||||
build/hello/hello.bin
|
||||
|
||||
KERNEL_CPP_SRCS = $(wildcard src/kernel/*.cpp) $(wildcard src/kernel/*/*.cpp)
|
||||
@@ -39,12 +39,14 @@ run: disk.img
|
||||
debug: disk.img
|
||||
qemu-system-i386 -s -S -no-reboot -no-shutdown disk.img & gdb --command=gdbscript
|
||||
|
||||
disk.img: clean prepare build/boot/boot.bin build/boot_stage2/boot.bin $(DISK_IMG_FILES)
|
||||
disk.img: clean prepare build/boot/boot.bin build/boot_stage2/boot.bin $(DISK_IMG_FILES) build/world/world.bin
|
||||
dd if=/dev/zero of=disk.img count=43 bs=100k
|
||||
dd if=build/boot/boot.bin of=disk.img conv=notrunc
|
||||
dd obs=512 seek=1 if=build/boot_stage2/boot.bin of=disk.img conv=notrunc
|
||||
mount disk.img img.d
|
||||
mkdir img.d/etc/
|
||||
cp $(DISK_IMG_FILES) img.d/
|
||||
cp build/world/world.bin img.d/etc/world.bin
|
||||
sleep 0.1
|
||||
umount img.d
|
||||
chmod 777 disk.img
|
||||
|
||||
Reference in New Issue
Block a user