Skip to content

Commit

Permalink
Rename iso file name
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryand1234 committed May 17, 2024
1 parent 607548d commit 5957f07
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions iso.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ mkdir -p isodir
mkdir -p isodir/boot
mkdir -p isodir/boot/grub

cp sysroot/boot/myos.kernel isodir/boot/myos.kernel
cp sysroot/boot/cheakyos.kernel isodir/boot/cheakyos.kernel

cat > isodir/boot/grub/grub.cfg << EOF
menuentry "myos" {
multiboot /boot/myos.kernel
multiboot /boot/cheakyos.kernel
}
EOF
grub-mkrescue -o myos.iso isodir
grub-mkrescue -o cheakyos.iso isodir
12 changes: 6 additions & 6 deletions kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ $(ARCHDIR)/crtn.o \
.PHONY: all clean install install-headers install-kernel
.SUFFIXES: .o .c .S

all: myos.kernel
all: cheakyos.kernel

myos.kernel: $(OBJS) $(ARCHDIR)/linker.ld
cheakyos.kernel: $(OBJS) $(ARCHDIR)/linker.ld
$(CC) -T $(ARCHDIR)/linker.ld -o $@ $(CFLAGS) $(LINK_LIST)
grub-file --is-x86-multiboot myos.kernel
grub-file --is-x86-multiboot cheakyos.kernel

$(ARCHDIR)/crtbegin.o $(ARCHDIR)/crtend.o:
OBJ=`$(CC) $(CFLAGS) $(LDFLAGS) -print-file-name=$(@F)` && cp "$$OBJ" $@
Expand All @@ -74,7 +74,7 @@ $(ARCHDIR)/crtbegin.o $(ARCHDIR)/crtend.o:


clean:
rm -f myos.kernel
rm -f cheakyos.kernel
rm -f $(OBJS) *.o */*.o */*/*.o
rm -f $(OBJS:.o=.d) *.d */*.d */*/*.d
rm -f ${ARCHDIR} *.o */*.o */*/*/*.o
Expand All @@ -85,8 +85,8 @@ install-headers:
mkdir -p $(DESTDIR)$(INCLUDEDIR)
cp -R --preserve=timestamps include/. $(DESTDIR)$(INCLUDEDIR)/.

install-kernel: myos.kernel
install-kernel: cheakyos.kernel
mkdir -p $(DESTDIR)$(BOOTDIR)
cp myos.kernel $(DESTDIR)$(BOOTDIR)
cp cheakyos.kernel $(DESTDIR)$(BOOTDIR)

-include $(OBJS:.o=.d)
2 changes: 1 addition & 1 deletion qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -e

. ./iso.sh

qemu-system-$(./target-triplet-to-arch.sh $HOST) -cdrom myos.iso
qemu-system-$(./target-triplet-to-arch.sh $HOST) -cdrom cheakyos.iso

0 comments on commit 5957f07

Please sign in to comment.