Hyperion/HyperionOS
6
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

spm works maybe?

Browse Source
This commit is contained in:
Astronand
2026-08-14 20:44:11 -04:00
parent 56646625c0
commit 10aa0c62ff
82 changed files with 1706 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Hyperion-kernel/data/boot/kernel.lua
+32 -11
View File
@@ -1,5 +1,6 @@
--:Minify:--
local EFI=...
--pf
EFI.beep(440, 500)
local screen=EFI.screenCtl
local ifs=EFI.initfs
@@ -302,20 +303,24 @@ for _, i in ipairs(ifs.list("/lib/modules")) do
for _,v in ipairs(modlist) do
local prior=tonumber(v:sub(1,2))
if prior then
modules[prior+1][#modules[prior+1]+1]="/lib/modules/"..i.."/"..v
modules[prior+1][#modules[prior+1]+1]=i.."/"..v
end
end
end
end
kernel.ifs=ifs
--pf
kernel.apis=EFI.firmware
--pf
kernel.EFI=EFI
kernel.arch=arch
kernel.initdisks=disks
kernel.screen=screen
kernel.processes={}
kernel.fstab=fstab
kernel.denied={}
kernel.loadingModule="kernel"
kernel.kernelTask = {
name="kernel",
@@ -357,6 +362,11 @@ function kernel.asyncReturn(...)
kernel.currentTask.syscallReturn = {...}
end
function kernel.deny(moduleid)
kernel.denied[moduleid]=true
if kernel.config.showModLoad then kernel.log("Module "..kernel.loadingModule.." denied "..moduleid, "DBUG", 0xFF0000) end
end
kernel.syscalls["time"]=function() return kernel.EFI:getEpochMs() end
kernel.syscalls["date"]=function() return kernel.EFI:date() end
kernel.syscalls["log"]=kernel.log
@@ -390,28 +400,39 @@ kernel.syscalls["halt"]=function()
kernel.halt()
end
end
kernel.syscalls["saveLog"]=function()
if kernel.uid==0 or kernel.groups.wheel then
kernel.saveLog()
end
end
kernel.saveLog()
kernel.log("Running modules")
for _,p in ipairs(modules) do
for _,v in ipairs(p) do
if kernel.config.showModLoad then kernel.log("Loading module "..v, "DBUG", 0x00FFFF) end
local code=ifs.readAllText(v)
if not code then
kernel.panic("Failed to read module "..v)
kernel.loadingModule=v
if not kernel.denied[v] then
if kernel.config.showModLoad then kernel.log("Loading module "..v, "DBUG", 0x00FFFF) end
local code=ifs.readAllText("/lib/modules/"..v)
if not code then
kernel.panic("Failed to read module "..v)
end
local func,err=load(code,"@"..v)
if not func then kernel.panic("ModuLoadErr: "..tostring(err)) end
local status, err = xpcall(func,debug.traceback, kernel)
if not status then kernel.panic("ModuRunErr: "..tostring(err)) end
if kernel.config.showModLoad then kernel.log("Loaded module "..v, "DBUG", 0x00FFFF) end
if kernel.config.moreLogsaves then kernel.saveLog() end
else
if kernel.config.showModLoad then kernel.log("Denied module "..v, "DBUG", 0xFF0000) end
end
local func,err=load(code,"@"..v)
if not func then kernel.panic("ModuLoadErr: "..tostring(err)) end
local status, err = xpcall(func,debug.traceback, kernel)
if not status then kernel.panic("ModuRunErr: "..tostring(err)) end
if kernel.config.showModLoad then kernel.log("Loaded module "..v, "DBUG", 0x00FFFF) end
if kernel.config.moreLogsaves then kernel.saveLog() end
end
end
kernel.log("Kernel initialized successfully.")
kernel.saveLog()
kernel.status="running"
kernel.loadingModule=nil
screen:disable()
local ok,err = xpcall(kernel.main, debug.traceback)
if not ok then
Src/Hyperion-kernel/data/lib/modules/hyperion/10_vfs.kmod
+11 -2
View File
@@ -690,7 +690,9 @@ function vfs.open(path, mode)
local handle
if disk:type(diskPath) ~= "directory" then
handle = disk:open(diskPath, mode)
if type(handle) ~= "table" then error("ENFILE") end
if type(handle, true) ~= "table" then
error("ENFILE")
end
end
if isNew then
@@ -761,7 +763,7 @@ function vfs.close(fd)
local task = kernel.currentTask
local file = task.fd[fd]
if not file then error("EBADF") end
if not task.fd[fd].isvirt then
if not task.fd[fd].isvirt then
total = total - 1
end
task.fd[fd] = nil
@@ -1147,6 +1149,12 @@ function vfs.devctl(fd, method, ...)
return kernel.currentTask.fd[fd].handle[method](...)
end
function vfs.devlst(fd)
if not kernel.currentTask.fd[fd] then error("EBADF") end
if not kernel.currentTask.fd[fd] then error("EINVAL") end
return table.keys(kernel.currentTask.fd[fd].handle)
end
vfs.resolveMount = resolveMount
local sys = kernel.syscalls
@@ -1179,6 +1187,7 @@ sys["chroot"] = vfs.chroot
sys["dup"] = vfs.dup
sys["dup2"] = vfs.dup2
sys["devctl"] = vfs.devctl
sys["devlst"] = vfs.devlst
sys["symlink"] = vfs.symlink
sys["readlink"] = vfs.readlink
sys["access"] = vfs.access
Src/Hyperion-kernel/data/lib/modules/hyperion/12_devfs.kmod
+12 -4
View File
@@ -214,6 +214,8 @@ end
data[".meta"]=strFile(buildMeta({
stdin="/proc/self/fd/0",
stdout="/proc/self/fd/1",
stderr="/proc/self/2",
fd="/proc/self/fd",
log="/var/log/syslog.log"
}))
@@ -222,6 +224,7 @@ if kernel.EFI.getEEPROM then
if op=="type" then
return "character device"
elseif op=="open" then
if kernel.uid~=0 then error("EACCES") end
if mode=="r" then
local ptr,eeprom=1,kernel.EFI:getEEPROM()
return {
@@ -231,7 +234,6 @@ if kernel.EFI.getEEPROM then
end
}
elseif mode=="w" then
if kernel.uid~=0 then error("EACCES") end
local firstwrite=true
return {
write=function(data)
@@ -243,7 +245,6 @@ if kernel.EFI.getEEPROM then
end
}
elseif mode=="a" then
if kernel.uid~=0 then error("EACCES") end
return {
write=function(data)
kernel.EFI:setEEPROM(kernel.EFI:getEEPROM()..data)
@@ -260,6 +261,7 @@ if kernel.EFI.getNvram then
if op=="type" then
return "character device"
elseif op=="open" then
if kernel.uid~=0 then error("EACCES") end
if mode=="r" then
local ptr,nvram=1,kernel.EFI:getNvram()
return {
@@ -269,7 +271,6 @@ if kernel.EFI.getNvram then
end
}
elseif mode=="w" then
if kernel.uid~=0 then error("EACCES") end
local firstwrite=true
return {
write=function(data)
@@ -281,7 +282,6 @@ if kernel.EFI.getNvram then
end
}
elseif mode=="a" then
if kernel.uid~=0 then error("EACCES") end
return {
write=function(data)
kernel.EFI:setNvram(kernel.EFI:getNvram()..data)
@@ -294,7 +294,15 @@ if kernel.EFI.getNvram then
end
data["disk"]={["by-id"]={}, ["by-path"]={}, ["by-label"]={}}
-- disks
for i,v in pairs(kernel.vfs.mounts) do
end
data["raw"]={["by-type"]={}}
data["gfx"]={}
data["input"]={}
data["tty"]={}
kernel.devfs={}
kernel.devfs.data=data
kernel.devfs.proxy=proxy
Src/Hyperion-kernel/data/lib/modules/hyperion/45_hypervisor.kmod
-1
View File
@@ -150,7 +150,6 @@ function sys.exec(path, args, envars)
tasks[tostring(task.pid)].status = "Z"
end)
task.syscallReturn = {}
coroutine.yield()
end
function sys.sleep(s)
Src/Hyperion-kernel/data/lib/modules/hyperion/47_dbg.kmod → Src/Hyperion-kernel/data/lib/modules/hyperion/48_dbg.kmod
View File
Src/Hyperion-kernel/data/lib/modules/hyperion/90_kgc.kmod
+2 -1
View File
@@ -1,3 +1,4 @@
--:Minify:--
local kernel = ...
kernel.processes.kgc = function()
while true do
@@ -6,6 +7,6 @@ kernel.processes.kgc = function()
kernel.reqcache[i] = nil
end
end
kernel.sleep(5000)
sleep(5)
end
end