diff options
| author | Miguel <m.i@gmx.at> | 2018-08-18 22:42:20 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-08-18 22:42:20 +0200 |
| commit | a2bd733e517364b6c9ddd26706d85fac09656854 (patch) | |
| tree | 71598cc6af31331710ca99ae94ddd7fb3dc4c9e5 | |
| parent | 4793dda3ada333e4462a8d6faa0705d8b3ba3890 (diff) | |
added git-revision to kernel log
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | grubiso/boot/grub/grub.cfg | 2 | ||||
| -rw-r--r-- | kernel/kernel.c | 3 | ||||
| -rw-r--r-- | kernel/kernel.h | 3 |
4 files changed, 8 insertions, 3 deletions
@@ -7,6 +7,8 @@ ############ compiler ############ +GIT_REVISION=$(shell git rev-parse HEAD) + #use our cross compiler CC=i686-foolos-gcc AS=i686-foolos-as @@ -18,6 +20,7 @@ AS=i686-elf-as ############ compiler flags ############ CFLAGS= +CFLAGS=-DGIT_REVISION=\"$(GIT_REVISION)\" CFLAGS+=-ffreestanding # do we need this if using own compiler? CFLAGS+=-nostdlib CFLAGS+=-O0 diff --git a/grubiso/boot/grub/grub.cfg b/grubiso/boot/grub/grub.cfg index bc4046a..34d55c3 100644 --- a/grubiso/boot/grub/grub.cfg +++ b/grubiso/boot/grub/grub.cfg @@ -6,4 +6,6 @@ menuentry "FoolOS" { multiboot /boot/foolos.bin echo "Loading Ram Disk..." module /boot/ext2.img + echo "Starting Fool OS..." + echo "------------------------" } diff --git a/kernel/kernel.c b/kernel/kernel.c index cc7d938..fcfb8d7 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -28,7 +28,8 @@ void kernel_main(uint32_t eax,uint32_t ebx) // PR log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%s - compiled on %s at %s", - KERNEL_VERSION,__DATE__,__TIME__); + KERNEL_NAME,__DATE__,__TIME__); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"git revision: %s",GIT_REVISION); // PIT TIMER timer_init(); diff --git a/kernel/kernel.h b/kernel/kernel.h index 8d2bce9..7dcb4e8 100644 --- a/kernel/kernel.h +++ b/kernel/kernel.h @@ -1,4 +1,3 @@ - /******************************************** * F00l 0S Central Configuration File * ********************************************/ @@ -8,7 +7,7 @@ #include "lib/logger/log.h" -#define KERNEL_VERSION "FoolOS 0.3.2" +#define KERNEL_NAME "FoolOS" #define FIFO_MAX_RINGBUFFERS 20 #define MAX_FIFOS 20 #define MAX_FD 20 |