apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Remove the .elf suffix from the kernel filename

Browse Source
This commit is contained in:
apio 2022-11-03 20:44:37 +01:00
parent e5b2641019
commit cbc2e76082
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -2,8 +2,8 @@ Luna.iso
toolchain/ toolchain/
.vscode/ .vscode/
**/*.o **/*.o
initrd/boot/moon.elf initrd/boot/moon
kernel/bin/moon.elf kernel/bin/moon
initrd/sys/moon.sym initrd/sys/moon.sym
initrd/bin/** initrd/bin/**
apps/bin/** apps/bin/**

2
Makefile
View File

@ -16,7 +16,7 @@ clean: initrd-clean
@$(MAKE) -C apps clean @$(MAKE) -C apps clean
initrd-clean: initrd-clean:
rm -f $(LUNA_ROOT)/initrd/boot/moon.elf $(LUNA_ROOT)/Luna.iso rm -f $(LUNA_ROOT)/initrd/boot/moon $(LUNA_ROOT)/Luna.iso
rm -rf $(LUNA_ROOT)/initrd/bin rm -rf $(LUNA_ROOT)/initrd/bin
install: install:

2
initrd/sys/config
View File

@ -1,3 +1,3 @@
screen=1024x768 screen=1024x768
kernel=boot/moon.elf kernel=boot/moon
verbose=1 verbose=1

10
kernel/Makefile
View File

@ -27,7 +27,7 @@ OBJS = $(patsubst $(MOON_SRC)/%.cpp, $(MOON_OBJ)/%.cpp.o, $(CXX_SRC))
OBJS += $(patsubst $(MOON_SRC)/%.c, $(MOON_OBJ)/%.c.o, $(C_SRC)) OBJS += $(patsubst $(MOON_SRC)/%.c, $(MOON_OBJ)/%.c.o, $(C_SRC))
OBJS += $(patsubst $(MOON_SRC)/%.asm, $(MOON_OBJ)/%.asm.o, $(NASM_SRC)) OBJS += $(patsubst $(MOON_SRC)/%.asm, $(MOON_OBJ)/%.asm.o, $(NASM_SRC))
default: $(MOON_BIN)/moon.elf default: $(MOON_BIN)/moon
$(MOON_OBJ)/main.cpp.o: $(MOON_SRC)/main.cpp $(MOON_OBJ)/main.cpp.o: $(MOON_SRC)/main.cpp
@mkdir -p $(@D) @mkdir -p $(@D)
@ -55,17 +55,17 @@ $(MOON_OBJ)/%.asm.o: $(MOON_SRC)/%.asm
build: $(OBJS) build: $(OBJS)
@mkdir -p $(MOON_BIN) @mkdir -p $(MOON_BIN)
$(CC) $(OBJS) $(LDFLAGS) -o $(MOON_BIN)/moon.elf $(CC) $(OBJS) $(LDFLAGS) -o $(MOON_BIN)/moon
clean: clean:
rm -rf $(MOON_OBJ)/* rm -rf $(MOON_OBJ)/*
rm -rf $(MOON_BIN)/* rm -rf $(MOON_BIN)/*
install: $(MOON_BIN)/moon.elf install: $(MOON_BIN)/moon
@mkdir -p $(LUNA_ROOT)/initrd/boot @mkdir -p $(LUNA_ROOT)/initrd/boot
cp $^ $(LUNA_ROOT)/initrd/boot/moon.elf cp $^ $(LUNA_ROOT)/initrd/boot/moon
$(LUNA_ROOT)/tools/generate-symbols.sh $(LUNA_ROOT)/tools/generate-symbols.sh
$(STRIP) $(LUNA_ROOT)/initrd/boot/moon.elf $(STRIP) $(LUNA_ROOT)/initrd/boot/moon
.PHONY: build clean install FORCE .PHONY: build clean install FORCE
FORCE: FORCE:

2
tools/generate-symbols.sh
View File

@ -6,4 +6,4 @@ source $(dirname $0)/env.sh
cd $LUNA_ROOT cd $LUNA_ROOT
nm -C -n initrd/boot/moon.elf | grep -vE \\.Lubsan_data | awk '{ if ($2 != "a") print; }' | uniq > initrd/sys/moon.sym nm -C -n initrd/boot/moon | grep -vE \\.Lubsan_data | awk '{ if ($2 != "a") print; }' | uniq > initrd/sys/moon.sym