kernel: rename GIT_HASH to KERNEL_GIT_HASH (#630)

willdurand · Apr 4, 2022 · 81e1165 · 81e1165
1 parent dd5ccbd
commit 81e1165
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -202,7 +202,7 @@ KERNEL_CFLAGS    += -ffunction-sections -fdata-sections
 KERNEL_CFLAGS    += $(WERRORS)
 KERNEL_CFLAGS    += $(KERNEL_CONFIG)
 
-KERNEL_CONFIG += -DGIT_HASH=\"$(git_hash)\"
+KERNEL_CONFIG += -DKERNEL_GIT_HASH=\"$(git_hash)\"
 KERNEL_CONFIG += -DARCH=\"$(ARCH)\"
 
 DEBUG_CFLAGS  += -g3 -DDEBUG_MODE

diff --git a/include/kernel/osinfo.h b/include/kernel/osinfo.h
@@ -35,8 +35,8 @@
 #define KERNEL_DATE __DATE__
 #define KERNEL_TIME __TIME__
 
-#ifndef GIT_HASH
-#define GIT_HASH "dirty"
+#ifndef KERNEL_GIT_HASH
+#define KERNEL_GIT_HASH "dirty"
 #endif
 
 #endif
diff --git a/src/kernel/fs/proc/version.c b/src/kernel/fs/proc/version.c
@@ -11,7 +11,7 @@ int proc_read_version(char* buf, size_t size)
            "%s %s (%s) %s\n",
            KERNEL_NAME,
            KERNEL_VERSION,
-           GIT_HASH,
+           KERNEL_GIT_HASH,
            KERNEL_TARGET);
 
   return 0;

diff --git a/src/kernel/kmain.c b/src/kernel/kmain.c
@@ -29,7 +29,7 @@ void kmain_early_start()
   INFO("%s %s (%s) for %s has started",
        KERNEL_NAME,
        KERNEL_VERSION,
-       GIT_HASH,
+       KERNEL_GIT_HASH,
        KERNEL_TARGET);
 }