diff --git a/meta/plugins/build.py b/meta/plugins/build.py index d0b3c83..58381d8 100644 --- a/meta/plugins/build.py +++ b/meta/plugins/build.py @@ -6,7 +6,7 @@ class Builder: self.__registry = model.Registry.use(args) self.__kernel_scope = builder.TargetScope( self.__registry, - self.__registry.lookup(f"kernel-{arch}", model.Target), + self.__registry.lookup(f"navy-{arch}", model.Target), ) def build_core(self) -> Path: diff --git a/meta/plugins/cli.py b/meta/plugins/cli.py index 4a1c4c9..5b30de3 100644 --- a/meta/plugins/cli.py +++ b/meta/plugins/cli.py @@ -4,12 +4,12 @@ from . import build from . import image from . import qemu -@cli.command("k", "kernel", "kernel related commands") +@cli.command("n", "navy", "Navy related commands") def _(args: cli.Args): pass -@cli.command("b", "kernel/boot", "Boot kernel") +@cli.command("b", "navy/boot", "Boot Navy") def _(args: cli.Args): qemu.Qemu( image.Image( @@ -18,6 +18,6 @@ def _(args: cli.Args): ).run() -@cli.command("B", "kernel/build", "Build kernel") +@cli.command("B", "navy/build", "Build Navy") def _(args: cli.Args): build.Builder(args).build_core() \ No newline at end of file diff --git a/meta/plugins/image.py b/meta/plugins/image.py index cbbc353..6e9d8cd 100644 --- a/meta/plugins/image.py +++ b/meta/plugins/image.py @@ -4,7 +4,7 @@ from cutekit import const, shell from .build import Builder class Image: - def __init__(self, builder: Builder, dst: Path = Path(".") / const.PROJECT_CK_DIR / "kernel"): + def __init__(self, builder: Builder, dst: Path = Path(".") / const.PROJECT_CK_DIR / "navy"): self.builder = builder self.path = dst @@ -38,7 +38,7 @@ class Image: cfg = [ "TIMEOUT=0", "GRAPHICS=no", - ":kernel", + ":navy", "PROTOCOL=limine", "KERNEL_PATH=boot:///boot/kernel.elf", ] diff --git a/meta/targets/kernel-x86_64.json b/meta/targets/navy-x86_64.json similarity index 97% rename from meta/targets/kernel-x86_64.json rename to meta/targets/navy-x86_64.json index 4e70499..760dd5e 100644 --- a/meta/targets/kernel-x86_64.json +++ b/meta/targets/navy-x86_64.json @@ -1,12 +1,12 @@ { "$schema": "https://schemas.cute.engineering/stable/cutekit.manifest.target.v1", - "id": "kernel-x86_64", + "id": "navy-x86_64", "type": "target", "props": { "toolchain": "clang", "arch": "x86_64", "bits": "64", - "sys": "kernel", + "sys": "navy", "loader": "limine", "abi": "sysv", "encoding": "utf8", diff --git a/meta/targets/kernel-x86_64.ld b/meta/targets/navy-x86_64.ld similarity index 100% rename from meta/targets/kernel-x86_64.ld rename to meta/targets/navy-x86_64.ld diff --git a/project.json b/project.json index e942cd6..f370016 100644 --- a/project.json +++ b/project.json @@ -1,7 +1,7 @@ { "$schema": "https://schemas.cute.engineering/stable/cutekit.manifest.project.v1", "type": "project", - "id": "kernel", + "id": "navy-org/navy", "extern": { "cute-engineering/libheap": { "git": "https://github.com/cute-engineering/libheap.git",