Skip to content

Commit 4ce53ed

Browse files
committed
meta: Update deps.
1 parent 41ad32e commit 4ce53ed

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

project.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,22 @@
5757
"tag": "main"
5858
},
5959
"skift/hideo": {
60-
"commit": "94acb4d51197138ce5d44e2798371c9e3958c5f3",
60+
"commit": "4067ebc75c9a3eb482787b72ea1e518f3bc7c8a8",
6161
"git": "https://codeberg.org/skift/hideo.git",
6262
"tag": "main"
6363
},
6464
"skift/karm": {
65-
"commit": "fcef58f407f1799df48353560927bf90694c0473",
65+
"commit": "ee04265e84d30cd6d081a945edb1d8442ff8c9d5",
6666
"git": "https://codeberg.org/skift/karm.git",
6767
"tag": "main"
6868
},
6969
"skift/luna": {
70-
"commit": "c9bc1ce86ff7eddd90f97b25372d5d0a5d285360",
70+
"commit": "cdd6d8be3ded5eda997ba240c2843e4df8ca26a4",
7171
"git": "https://codeberg.org/skift/luna",
7272
"tag": "main"
7373
},
7474
"skift/vaerk": {
75-
"commit": "bc0f9dea9390462ffe7ab9cf44b569703337876e",
75+
"commit": "2c3832534c11b32f4b4398c11f1ba1db5ddd85dc",
7676
"git": "https://codeberg.org/skift/vaerk",
7777
"tag": "main"
7878
},

src/kernel/hjert/x86_64/entry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Hjert.Core;
66
HandoverRequests$(
77
Handover::requestStack(),
88
Handover::requestFb(),
9-
Handover::requestFiles()
9+
Handover::requestBlobs()
1010
);
1111

1212
void __panicHandler(PanicKind kind, char const* buf, usize len) {

src/kernel/opstart/loader.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ export Res<> loadEntry(Entry const& entry) {
3535
logInfo("opstart: loading kernel file...");
3636
auto kernelFile = try$(Sys::File::open(entry.kernel.url));
3737
auto kernelMem = try$(Sys::mmap(kernelFile));
38-
Elf::ElfObject<Elf::Elf64LeAbi> object{kernelMem.bytes()};
38+
Elf::ElfObject<Elf::CurrentAbi> object{kernelMem.bytes()};
3939
try$(object.validate());
4040

41-
payload.add(Handover::FILE, 0, kernelMem.prange());
41+
payload.add(Handover::BLOB, 0, kernelMem.prange());
4242
logInfo("opstart: kernel at vaddr: {p} paddr: {p}", kernelMem.vaddr(), kernelMem.paddr());
4343

4444
logInfo("opstart: setting up stack...");
@@ -72,10 +72,10 @@ export Res<> loadEntry(Entry const& entry) {
7272
auto propStr = try$(Json::unparse(blob.props));
7373

7474
payload.add({
75-
.tag = Handover::FILE,
75+
.tag = Handover::BLOB,
7676
.start = blobRange.start,
7777
.size = blobRange.size,
78-
.file = {
78+
.blob = {
7979
.name = (u32)payload.add(blob.url.str()),
8080
.meta = (u32)payload.add(propStr),
8181
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export struct Bootfs {
2828

2929
auto& handover = useHandover();
3030

31-
auto* bootfsRecord = handover.fileByName("file:/skift/init.bootfs");
31+
auto* bootfsRecord = handover.blobByName("file:/skift/init.bootfs");
3232
if (not bootfsRecord)
3333
return Error::notFound("no bootfs");
3434

src/srvs/strata-cm/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static Res<Hj::Task> loadElf(String id, Rc<Sys::Skift::DuplexFd> fd) {
3737
auto elfSpace = try$(Hj::Space::create(Hj::ROOT));
3838

3939
logInfoIf(DEBUG_ELF, "validating elf...");
40-
Elf::ElfObject<Elf::Elf64LeAbi> object{elfRange.bytes()};
40+
Elf::ElfObject<Elf::CurrentAbi> object{elfRange.bytes()};
4141
try$(object.validate());
4242

4343
logInfoIf(DEBUG_ELF, "mapping the elf...");

src/srvs/strata-fs/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ struct FsHandler : Ipc::Handler {
111111
Async::Task<> entryPointAsync(Sys::Env&, Async::CancellationToken ct) {
112112
auto& handover = Sys::Skift::useHandover();
113113

114-
auto* bootfsRecord = handover.fileByName("file:/skift/init.bootfs");
114+
auto* bootfsRecord = handover.blobByName("file:/skift/init.bootfs");
115115
if (not bootfsRecord)
116116
co_return Error::notFound("no bootfs");
117117

0 commit comments

Comments
 (0)