aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Moffett <ian@osmora.org>2023-12-21 10:42:14 -0500
committerIan Moffett <ian@osmora.org>2023-12-21 10:42:14 -0500
commite1b2a505f0ea92da30ac51d7bdb40a9f586d4af0 (patch)
treeeeaebc6f7dd829c2ea1cee0c7fcc1684f480d0cd
parentea0290d541d985f84e77f1e8f3b8fadfb5fa9fd9 (diff)
build: Update build constant OS prefixes
Signed-off-by: Ian Moffett <ian@osmora.org>
-rw-r--r--Makefile.in10
-rw-r--r--sys/include/lib/logo.h2
-rw-r--r--sys/kern/init_main.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index e57d3a3..b00c05d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,12 +17,12 @@ endif
# CFLAGS, QEMU flags + misc
###############################
override ARCH = @ARCH@
-override VEGA_VERSION = @PACKAGE_VERSION@
+override HYRA_VERSION = @PACKAGE_VERSION@
override PROMPT := printf "%s\t\t%s\n"
-override KERNEL_DEFINES = -DVEGA_VERSION="\"$(VEGA_VERSION)\""\
- -DVEGA_BUILDDATE="\"@VEGA_BUILDDATE@\""\
- -DVEGA_BUILDBRANCH="\"@VEGA_BUILDBRANCH@\""\
- -DVEGA_ARCH="\"@ARCH@\""\
+override KERNEL_DEFINES = -DHYRA_VERSION="\"$(HYRA_VERSION)\""\
+ -DHYRA_BUILDDATE="\"@HYRA_BUILDDATE@\""\
+ -DHYRA_BUILDBRANCH="\"@HYRA_BUILDBRANCH@\""\
+ -DHYRA_ARCH="\"@ARCH@\""\
$(SPECTRE_FLAGS)
override KERNEL_CFLAGS = @KERNEL_CFLAGS@ $(KERNEL_DEFINES)
override KERNEL_LDFLAGS = -nostdlib -zmax-page-size=0x1000 -static -Tconf/link-$(ARCH).ld
diff --git a/sys/include/lib/logo.h b/sys/include/lib/logo.h
index ad999b4..4d5c93a 100644
--- a/sys/include/lib/logo.h
+++ b/sys/include/lib/logo.h
@@ -33,7 +33,7 @@
#define COPYRIGHT "Copyright (c) 2023 Ian Marco Moffett and the Osmora Team."
#define PRINT_LOGO() \
- kprintf("%s v%s\n\n", g_logo, VEGA_VERSION); \
+ kprintf("%s v%s\n\n", g_logo, HYRA_VERSION); \
kprintf("\t%s\n\n", COPYRIGHT);
extern uint8_t g_logo[];
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 8e77010..6840b3b 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -78,8 +78,8 @@ main(void)
PRINT_LOGO();
kprintf("Hyra/%s v%s: %s (%s)\n",
- VEGA_ARCH, VEGA_VERSION, VEGA_BUILDDATE,
- VEGA_BUILDBRANCH);
+ HYRA_ARCH, HYRA_VERSION, HYRA_BUILDDATE,
+ HYRA_BUILDBRANCH);
acpi_init();