pjht/os
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move iso files to sysroot

Browse Source
This commit is contained in:
pjht 2019-08-26 13:32:19 -05:00
parent 0b42b86eba
commit 4fadffc59a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -11,5 +11,5 @@ init/init
vfs/vfs vfs/vfs
fsdrv/fsdrv fsdrv/fsdrv
initrd/* initrd/*
iso/boot/initrd.tar sysroot/boot/initrd.tar
serout serout

8
Makefile
View File

@ -31,9 +31,9 @@ debug: os.iso kernel/kernel.elf
#gdbgui -g i386-elf-gdb --project $(CWD) #gdbgui -g i386-elf-gdb --project $(CWD)
os.iso: kernel/kernel.elf init vfs fsdrv initrd os.iso: kernel/kernel.elf init vfs fsdrv initrd
@cp kernel/kernel.elf iso/boot @cp kernel/kernel.elf sysroot/boot
@cd initrd; tar -f ../iso/boot/initrd.tar -c * @cd initrd; tar -f ../sysroot/boot/initrd.tar -c *
@grub-mkrescue -o $@ iso >/dev/null 2>/dev/null @grub-mkrescue -o $@ sysroot >/dev/null 2>/dev/null
init: init/* kernel/start.o init: init/* kernel/start.o
@cd $@ && make @cd $@ && make
@ -64,4 +64,4 @@ libc/libc.a: $(LIBC_OBJ)
@$(AS) $< -o $@ @$(AS) $< -o $@
clean: clean:
@rm -rf initrd/* kernel/*.o drivers/*/*.o drivers/*/*/*.o cpu/*/*.o fs/*.o libc/libc.a kernel/cstart.o cpu/memory.h os.iso */*.elf iso/boot/initrd.tar @rm -rf initrd/* kernel/*.o drivers/*/*.o drivers/*/*/*.o cpu/*/*.o fs/*.o libc/libc.a kernel/cstart.o cpu/memory.h os.iso */*.elf sysroot/boot/initrd.tar

0
iso/boot/grub/grub.cfg → sysroot/boot/grub/grub.cfg
View File