diff options
author | Ian Moffett <ian@osmora.org> | 2025-04-18 21:57:44 -0400 |
---|---|---|
committer | Ian Moffett <ian@osmora.org> | 2025-04-18 21:57:44 -0400 |
commit | 9906547712a88cf4dc012a6f6bd6e2ad04c5e3f3 (patch) | |
tree | 41b40ec97f5082793b08a495f6a935bc3c1ed25f /builddeps | |
parent | 0b5adaff02190dad76d845381a41b998696d9e97 (diff) | |
parent | 92d4f9dae64ab5325feca1f39e5955415e8275b9 (diff) |
Merge branch 'expt' into aarch64
Signed-off-by: Ian Moffett <ian@osmora.org>
Diffstat (limited to 'builddeps')
-rw-r--r-- | builddeps/limine.cfg | 8 | ||||
-rw-r--r-- | builddeps/limine.conf | 13 | ||||
-rw-r--r-- | builddeps/tree.jpg | bin | 0 -> 370601 bytes | |||
-rw-r--r-- | builddeps/user.mk | 5 |
4 files changed, 16 insertions, 10 deletions
diff --git a/builddeps/limine.cfg b/builddeps/limine.cfg deleted file mode 100644 index 87b39de..0000000 --- a/builddeps/limine.cfg +++ /dev/null @@ -1,8 +0,0 @@ -TIMEOUT=0 - -:Hyra - -PROTOCOL=limine -KERNEL_PATH=boot:///boot/hyra-kernel -MODULE_PATH=boot:///boot/ramfs.cpio -EDITOR_ENABLED=no diff --git a/builddeps/limine.conf b/builddeps/limine.conf new file mode 100644 index 0000000..f1907ea --- /dev/null +++ b/builddeps/limine.conf @@ -0,0 +1,13 @@ +timeout=10 +${WALLPAPER_PATH}=boot():/boot/tree.jpg +wallpaper: ${WALLPAPER_PATH} +interface_branding_color: 1 +term_background: 40000000 +interface_branding: HYRA // OSMORA GATEWAY +resolution: 1280x720 + +/Hyra + protocol: limine + kernel_path: boot():/boot/hyra-kernel + module_path: boot():/boot/ramfs.cpio + diff --git a/builddeps/tree.jpg b/builddeps/tree.jpg Binary files differnew file mode 100644 index 0000000..f22460d --- /dev/null +++ b/builddeps/tree.jpg diff --git a/builddeps/user.mk b/builddeps/user.mk index 6c5b028..d7ad582 100644 --- a/builddeps/user.mk +++ b/builddeps/user.mk @@ -1,6 +1,7 @@ -CC = +CC = gcc LIBDIR = USRDIR = LDSCRIPT = INTERNAL_CFLAGS = -T$(LDSCRIPT) -znoexecstack -nostdlib -I$(USRDIR)/include/ \ - -L$(USRDIR)/lib -lc + -L$(USRDIR)/lib -lc -pie -no-pie -fno-stack-protector \ + -fno-asynchronous-unwind-tables |