meta: Update deps.

Author: sleepy-monax

meta/image/boot/efi/loader.json

@@ -3,7 +3,7 @@
     "entries": [
         {
             "name": "skiftOS",
-            "kernel": "bundle://hjert/_bin",
+            "kernel": "bundle://hjert/bin/hjert.elf",
             "icon": "file:/skift/logo.qoi",
             "blobs": [
                 "file:/skift/init.bootfs"

meta/plugins/start/image.py

@@ -47,9 +47,9 @@ def _installProduct(self, product: builder.ProductScope):
 
         # Copy the product binary/library
         if component.type == model.Kind.EXE:
-            dest = f"{base}/_bin"
+            dest = f"{base}/bin/{component.id}.elf"
         else:
-            dest = f"{base}/_lib"
+            dest = f"{base}/lib"
 
         self.cp(str(product.path), f"{dest}")
 

src/kernel/hjert/api/syscalls.cpp

@@ -105,7 +105,7 @@ export Res<> _start(Cap cap, usize ip, usize sp, Args const* args) {
 }
 
 export Res<> _map(Cap cap, usize* virt, Cap vmo, usize off, usize* len, Flags<MapFlags> flags) {
-    return _syscall(Syscall::MAP, cap.raw(), (Arg)virt, vmo.raw(), off, (Arg)len, (Arg)flags);
+    return _syscall(Syscall::MAP, cap.raw(), (Arg)virt, vmo.raw(), off, (Arg)len, flags.raw());
 }
 
 export Res<> _unmap(Cap cap, usize virt, usize len) {

src/kernel/hjert/core/init.cpp

@@ -48,7 +48,7 @@ Res<> enterUserspace(Handover::Payload& payload) {
     space->label("init-space");
 
     logInfo("entry: mapping elf...");
-    auto elfVmo = try$(_locateInit(payload, "bundles/strata-cm/_bin"));
+    auto elfVmo = try$(_locateInit(payload, "bundles/strata-cm/bin/strata-cm.elf"));
     elfVmo->label("elf-shared");
     auto elfRange = try$(kmm().pmm2Kmm(elfVmo->range()));
     Vaerk::Elf::Image image{elfRange.bytes()};

src/libs/karm-sys/efi/sys.cpp

@@ -245,7 +245,8 @@ static Res<Ref::Path> resolve(Ref::Url url) {
     }
 }
 
-Res<Rc<Fd>> openFile(Ref::Url const& url) {
+Res<Rc<Fd>> openFile(Ref::Url const& url, Flags<OpenOption> options) {
+    (void)options;
     static Efi::SimpleFileSystemProtocol* fileSystem = nullptr;
     if (not fileSystem) {
         fileSystem = try$(Efi::openProtocol<Efi::SimpleFileSystemProtocol>(Efi::li()->deviceHandle));
@@ -288,14 +289,6 @@ Res<Vec<DirEntry>> readDirOrCreate(Ref::Url const&) {
     return Error::notImplemented();
 }
 
-Res<Rc<Fd>> createFile(Ref::Url const&) {
-    return Error::notImplemented();
-}
-
-Res<Rc<Fd>> openOrCreateFile(Ref::Url const&) {
-    return Error::notImplemented();
-}
-
 Res<MmapResult> memMap(MmapProps const& options) {
     usize vaddr = 0;
 
@@ -329,7 +322,7 @@ Res<> memFlush(void*, usize) {
 }
 
 Res<Stat> stat(Ref::Url const& url) {
-    auto file = try$(openFile(url));
+    auto file = try$(openFile(url, OpenOption::READ));
     return file->stat();
 }
 

src/libs/karm-sys/skift/sys.cpp

@@ -58,49 +58,15 @@ static Res<Ref::Path> _resolveUrl(Ref::Url const& url) {
     }
 }
 
-Res<Rc<Fd>> openFile(Ref::Url const& url) {
+Res<Rc<Fd>> openFile(Ref::Url const& url, Flags<OpenOption> options) {
     auto path = try$(_resolveUrl(url));
     auto fid = try$(
         Sys::run(
             Skift::globalFsClient()
                 .callAsync<Strata::IFs::Open>(
                     {
                         path._segs,
-                        {Strata::IFs::Open::OPEN},
-                    },
-                    Async::CancellationToken::uninterruptible()
-                )
-        )
-    );
-    return Ok(makeRc<Skift::FsFd>(fid));
-}
-
-Res<Rc<Fd>> createFile(Ref::Url const& url) {
-    auto path = try$(_resolveUrl(url));
-    auto fid = try$(
-        Sys::run(
-            Skift::globalFsClient()
-                .callAsync<Strata::IFs::Open>(
-                    {
-                        path._segs,
-                        {Strata::IFs::Open::CREATE},
-                    },
-                    Async::CancellationToken::uninterruptible()
-                )
-        )
-    );
-    return Ok(makeRc<Skift::FsFd>(fid));
-}
-
-Res<Rc<Fd>> openOrCreateFile(Ref::Url const& url) {
-    auto path = try$(_resolveUrl(url));
-    auto fid = try$(
-        Sys::run(
-            Skift::globalFsClient()
-                .callAsync<Strata::IFs::Open>(
-                    {
-                        path._segs,
-                        {Strata::IFs::Open::OPEN, Strata::IFs::Open::CREATE},
+                        options,
                     },
                     Async::CancellationToken::uninterruptible()
                 )
@@ -131,7 +97,7 @@ Async::Task<Vec<DirEntry>> readDirAsync(Ref::Url const& url, Async::Cancellation
     auto fid = co_trya$(fs.callAsync<Strata::IFs::Open>(
         {
             path._segs,
-            {Strata::IFs::Open::OPEN},
+            {OpenOption::READ},
         },
         ct
     ));
@@ -153,7 +119,7 @@ Res<Vec<DirEntry>> readDirOrCreate(Ref::Url const&) {
 }
 
 Res<Stat> stat(Ref::Url const& url) {
-    auto fd = try$(openFile(url));
+    auto fd = try$(openFile(url, OpenOption::READ));
     return fd->stat();
 }
 

src/srvs/strata-cm/main.cpp

@@ -25,7 +25,7 @@ static Res<Hj::Task> loadElf(Sys::Context& ctx, String id, Rc<Sys::Skift::Duplex
     auto bootfs = try$(Sys::Skift::Bootfs::ensure());
 
     logInfoIf(DEBUG_ELF, "mapping elf...");
-    auto elfPath = Io::format("bundles/{}/_bin", id);
+    auto elfPath = Io::format("bundles/{}/bin/{}.elf", id, id);
     auto [elfVmo, _] = try$(bootfs->openVmo(elfPath.str()));
     auto elfRange = try$(Hj::map(elfVmo, Hj::MapFlags::READ));
 

src/srvs/strata-protos/ifs.cpp

@@ -12,14 +12,8 @@ export using Fid = usize;
 
 export struct Open {
     using Response = Fid;
-    enum struct Option {
-        OPEN,
-        CREATE
-    };
-    using enum Option;
-
     Vec<String> path;
-    Flags<Option> options;
+    Flags<Sys::OpenOption> options;
 };
 
 export struct Close {