enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-05-30 08:17:58 +00:00
Code Issues Actions Releases Wiki Activity

Update OS

Browse Source
This commit is contained in:
Alex 2023-08-06 04:55:00 +03:00
parent 7e78c2e124
commit 4b930236c7
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
10 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Fennix Kernel.code-workspace
View File

@ -38,7 +38,14 @@
"syscalls.h": "c", "syscalls.h": "c",
"cmath": "cpp", "cmath": "cpp",
"typeinfo": "c", "typeinfo": "c",
"exception": "cpp" "exception": "cpp",
"errno.h": "c",
"float.h": "c",
"mutex": "cpp",
"type_trails": "cpp",
"utility": "cpp",
"algorithm": "cpp",
"functional": "cpp"
}, },
"cSpell.words": [ "cSpell.words": [
"AABBCC", "AABBCC",
@ -129,6 +136,7 @@
"FAFAFAI", "FAFAFAI",
"Fargc", "Fargc",
"Fargv", "Fargv",
"fcreat",
"fctprintf", "fctprintf",
"Femto", "Femto",
"FENIXOS", "FENIXOS",

4
Fennix Userspace.code-workspace
View File

@ -36,7 +36,9 @@
"wait.h": "c", "wait.h": "c",
"base.h": "c", "base.h": "c",
"ld.h": "c", "ld.h": "c",
"syscall.h": "c" "syscall.h": "c",
"stdint.h": "c",
"setjmp.h": "c"
}, },
"cSpell.words": [ "cSpell.words": [
"auxv", "auxv",

2
Kernel

@ -1 +1 @@
Subproject commit 41db47717374df5bd340e2eeb55f8dbd416e3f45 Subproject commit 2c51e4432ff3ba3c2223a1925ae640225c3b24fa

2
Makefile
View File

@ -194,6 +194,8 @@ vscode_debug: build_lynx build_kernel build_userspace build_modules build_image
qemu: qemu_vdisk qemu: qemu_vdisk
rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp rm -f serial.log profiler.log memtrk.dmp serial4.dmp network.dmp
# touch serial.log
# x-terminal-emulator -e tail -f serial.log &
$(QEMU) $(QEMU_UEFI_BIOS) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) $(QEMU_SMP) $(QEMU) $(QEMU_UEFI_BIOS) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) $(QEMU_SMP)
qemubios: qemu_vdisk qemubios: qemu_vdisk

16
Makefile.conf
View File

@ -26,8 +26,6 @@ BUILD_MODULES = 1
QUIET_BUILD = 1 QUIET_BUILD = 1
USERSPACE_STATIC_LIBS = 1
# The path of the cross-compiler. # The path of the cross-compiler.
COMPILER_PATH = tools/cross/bin COMPILER_PATH = tools/cross/bin
@ -39,14 +37,14 @@ LIMINE_FOLDER = tools/limine
# it will be added automatically depending on the OSARCH) # it will be added automatically depending on the OSARCH)
QEMU_PATH = tools/cross/bin/qemu-system- QEMU_PATH = tools/cross/bin/qemu-system-
# Enable mlibc # Set libc to use. Available options:
MLIBC = 0 # - internal - Use the internal libc
# - musl - Use musl libc (linux syscalls)
# - mlibc - Use mlibc
USE_LIBC = internal
# Build all libraries as static libraries.
USERSPACE_STATIC_LIBS = 0

2
Userspace

@ -1 +1 @@
Subproject commit 964d5fa2d0a42637253f0877b3256a685412fa65 Subproject commit 2fd23205dbc32591eb6a1980237fb0b60058e9e6

1
initrd/etc/group Normal file
View File

@ -0,0 +1 @@
root:x:0:

1
initrd/etc/passwd Normal file
View File

@ -0,0 +1 @@
root:x:0:0:root:/root:/bin/sh

4
tools/grub.cfg
View File

@ -4,10 +4,10 @@ set menu_color_normal=white/black
set menu_color_highlight=black/light-gray set menu_color_highlight=black/light-gray
menuentry "Fennix" { menuentry "Fennix" {
load_video load_video
clear clear
echo "Loading kernel" echo "Loading kernel"
multiboot2 /kernel.fsys --alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/modules --init=/bin/init --ioc=true --udl=true --simd=false --bootanim=false multiboot2 /kernel.fsys --ioapicirq=1 --linux=false --ioc=true --udl=true --simd=true
echo "Loading initrd" echo "Loading initrd"
module2 /initrd.tar.gz initrd module2 /initrd.tar.gz initrd
echo "Booting..." echo "Booting..."

24
tools/limine.cfg
View File

@ -2,21 +2,11 @@ TIMEOUT=1
INTERFACE_BRANDING=Fennix INTERFACE_BRANDING=Fennix
:Fennix (limine) :Fennix (limine)
# DO NOT EDIT! # DO NOT EDIT!
COMMENT=Boot Fennix using limine protocol COMMENT=Boot Fennix using limine protocol
PROTOCOL=limine PROTOCOL=limine
KERNEL_CMDLINE=--alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/modules --init=/bin/init --ioc=true --udl=true --simd=false --bootanim=false KERNEL_CMDLINE=--ioapicirq=1 --linux=false --ioc=true --udl=true --simd=true
KERNEL_PATH=boot:///kernel.fsys KERNEL_PATH=boot:///kernel.fsys
MODULE_PATH=boot:///initrd.tar.gz MODULE_PATH=boot:///initrd.tar.gz
MODULE_CMDLINE=initrd MODULE_CMDLINE=initrd
:Fennix (multiboot2)
# DO NOT EDIT!
COMMENT=Boot Fennix using multiboot2 protocol
PROTOCOL=multiboot2
KERNEL_CMDLINE=--alloc=xallocv1 --cores=0 --ioapicirq=1 --tasking=multi --drvdir=/modules --init=/bin/init --ioc=true --udl=true --simd=false --bootanim=false
KERNEL_PATH=boot:///kernel.fsys
MODULE_PATH=boot:///initrd.tar.gz
MODULE_CMDLINE=initrd