diff options
Diffstat (limited to 'builddeps')
-rwxr-xr-x | builddeps/hooks/prepare-commit-msg | 15 | ||||
-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 | 6 |
5 files changed, 32 insertions, 10 deletions
diff --git a/builddeps/hooks/prepare-commit-msg b/builddeps/hooks/prepare-commit-msg new file mode 100755 index 0000000..df189ba --- /dev/null +++ b/builddeps/hooks/prepare-commit-msg @@ -0,0 +1,15 @@ +#!/bin/bash + +# Do we have whitespace errors? +files=$(git diff --cached --name-only) + +for file in $files +do + perl tools/checknl.pl $file 1>/dev/null + if [[ $? -ne 0 ]] + then + echo "** Failed to commit" + echo "** Whitespace error in $file" + exit 1 + fi +done 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..d5ed978 --- /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.krq + module_path: boot():/boot/ramfs.omar + 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..d991ef8 100644 --- a/builddeps/user.mk +++ b/builddeps/user.mk @@ -1,6 +1,8 @@ -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 -D_OSVER=\"$(OSVER)\" \ + -D_OSARCH=\"$(OSARCH)\" |