From cbc2e7608210bc6aa2b20fda4e968ecc84a1d1a4 Mon Sep 17 00:00:00 2001 From: apio Date: Thu, 3 Nov 2022 20:44:37 +0100 Subject: [PATCH] Remove the .elf suffix from the kernel filename --- .gitignore | 4 ++-- Makefile | 2 +- initrd/sys/config | 2 +- kernel/Makefile | 10 +++++----- tools/generate-symbols.sh | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c2d28f12..c759f33d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,8 @@ Luna.iso toolchain/ .vscode/ **/*.o -initrd/boot/moon.elf -kernel/bin/moon.elf +initrd/boot/moon +kernel/bin/moon initrd/sys/moon.sym initrd/bin/** apps/bin/** diff --git a/Makefile b/Makefile index 1127ab60..99ad75e9 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ clean: initrd-clean @$(MAKE) -C apps 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 install: diff --git a/initrd/sys/config b/initrd/sys/config index e197bfe0..926fdc83 100644 --- a/initrd/sys/config +++ b/initrd/sys/config @@ -1,3 +1,3 @@ screen=1024x768 -kernel=boot/moon.elf +kernel=boot/moon verbose=1 \ No newline at end of file diff --git a/kernel/Makefile b/kernel/Makefile index af19b9d3..57ccc724 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -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)/%.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 @mkdir -p $(@D) @@ -55,17 +55,17 @@ $(MOON_OBJ)/%.asm.o: $(MOON_SRC)/%.asm build: $(OBJS) @mkdir -p $(MOON_BIN) - $(CC) $(OBJS) $(LDFLAGS) -o $(MOON_BIN)/moon.elf + $(CC) $(OBJS) $(LDFLAGS) -o $(MOON_BIN)/moon clean: rm -rf $(MOON_OBJ)/* rm -rf $(MOON_BIN)/* -install: $(MOON_BIN)/moon.elf +install: $(MOON_BIN)/moon @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 - $(STRIP) $(LUNA_ROOT)/initrd/boot/moon.elf + $(STRIP) $(LUNA_ROOT)/initrd/boot/moon .PHONY: build clean install FORCE FORCE: \ No newline at end of file diff --git a/tools/generate-symbols.sh b/tools/generate-symbols.sh index 36bd4369..188949fb 100755 --- a/tools/generate-symbols.sh +++ b/tools/generate-symbols.sh @@ -6,4 +6,4 @@ source $(dirname $0)/env.sh cd $LUNA_ROOT -nm -C -n initrd/boot/moon.elf | grep -vE \\.Lubsan_data | awk '{ if ($2 != "a") print; }' | uniq > initrd/sys/moon.sym \ No newline at end of file +nm -C -n initrd/boot/moon | grep -vE \\.Lubsan_data | awk '{ if ($2 != "a") print; }' | uniq > initrd/sys/moon.sym \ No newline at end of file