rename prog to init

This commit is contained in:
pjht 2019-05-24 09:00:04 -05:00
parent 9518c8e4ad
commit 62e8f0713b
10 changed files with 5 additions and 5 deletions

View File

@ -28,15 +28,15 @@ debug: os.iso kernel/kernel.elf
@$(EMU) -s $(QFLAGS) &
@$(GDB) -ex "target remote localhost:1234" -ex "symbol-file kernel/kernel.elf"
os.iso: kernel/kernel.elf initrd/* initrd/prog.elf
os.iso: kernel/kernel.elf initrd/* initrd/init
@cp kernel/kernel.elf iso/boot
@cd initrd; tar -f ../iso/boot/initrd.tar -c *
@# ruby makeinitrd.rb initrd iso/boot/initrd
@grub-mkrescue -o $@ iso
initrd/prog.elf: prog/* kernel/start.o
@cd prog && make
@cp prog/prog.elf initrd/init
initrd/init: init/* kernel/start.o
@cd init && make
@cp init/init initrd/init
kernel/kernel.elf: $(OBJ) $(ASM_OBJ) $(S_ASM_OBJ) libc/libc.a
@$(CC) -z max-page-size=4096 -Xlinker -n -T cpu/$(PLAT)/linker.ld -o $@ $(CFLAGS) -nostdlib $^ -lgcc

View File

@ -3,7 +3,7 @@ OBJ = $(C_SOURCES:.c=.o ../kernel/start.o)
CFLAGS = -I../sysroot/usr/include -Wall -g -ffreestanding
CC = i386-elf-gcc
prog.elf: $(OBJ)
init: $(OBJ)
@i386-elf-ld -o $@ $^ ../libc/libc.a
@rm -rf *.o

BIN
init/init Executable file

Binary file not shown.

Binary file not shown.

Binary file not shown.