From 33f370966ddf677dab901b89a5e3287d9c8237a8 Mon Sep 17 00:00:00 2001
From: Qingsong Chen <changxian.cqs@antgroup.com>
Date: Mon, 5 Jan 2026 07:52:14 +0000
Subject: [PATCH] Rename aster-nix to aster-kernel

---
 .gitignore                               |  6 +-
 Cargo.lock                               | 88 ++++++++++++------------
 Components.toml                          |  2 +-
 distro/aster_nixos_installer/default.nix |  4 +-
 distro/etc_nixos/modules/core.nix        |  2 +-
 kernel/Cargo.toml                        |  2 +-
 kernel/comps/mlsdisk/src/os/mod.rs       |  2 +-
 tools/bump_version.sh                    |  2 +-
 8 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ce0d1f12..2dfb2af46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,9 +26,9 @@ virtio-net.pcap
 /result_*.json
 
 # profile results
-aster-nix-profile-*.json
-aster-nix-profile-*.folded
-aster-nix-profile-*.svg
+aster-kernel-profile-*.json
+aster-kernel-profile-*.folded
+aster-kernel-profile-*.svg
 
 # distro results
 distro/result
diff --git a/Cargo.lock b/Cargo.lock
index 05b356000..147d45f25 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -165,50 +165,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "aster-logger"
-version = "0.1.0"
-dependencies = [
- "aster-console",
- "component",
- "log",
- "ostd",
- "owo-colors",
-]
-
-[[package]]
-name = "aster-mlsdisk"
-version = "0.1.0"
-dependencies = [
- "aes-gcm",
- "aster-block",
- "bittle",
- "component",
- "ctr",
- "device-id",
- "hashbrown 0.14.5",
- "inherit-methods-macro",
- "lending-iterator",
- "log",
- "lru",
- "ostd",
- "postcard",
- "serde",
-]
-
-[[package]]
-name = "aster-network"
-version = "0.1.0"
-dependencies = [
- "aster-bigtcp",
- "aster-softirq",
- "bitvec",
- "component",
- "ostd",
- "spin",
-]
-
-[[package]]
-name = "aster-nix"
+name = "aster-kernel"
 version = "0.1.0"
 dependencies = [
  "align_ext",
@@ -268,6 +225,49 @@ dependencies = [
  "xmas-elf",
 ]
 
+[[package]]
+name = "aster-logger"
+version = "0.1.0"
+dependencies = [
+ "aster-console",
+ "component",
+ "log",
+ "ostd",
+ "owo-colors",
+]
+
+[[package]]
+name = "aster-mlsdisk"
+version = "0.1.0"
+dependencies = [
+ "aes-gcm",
+ "aster-block",
+ "bittle",
+ "component",
+ "ctr",
+ "device-id",
+ "hashbrown 0.14.5",
+ "inherit-methods-macro",
+ "lending-iterator",
+ "log",
+ "lru",
+ "ostd",
+ "postcard",
+ "serde",
+]
+
+[[package]]
+name = "aster-network"
+version = "0.1.0"
+dependencies = [
+ "aster-bigtcp",
+ "aster-softirq",
+ "bitvec",
+ "component",
+ "ostd",
+ "spin",
+]
+
 [[package]]
 name = "aster-pci"
 version = "0.1.0"
diff --git a/Components.toml b/Components.toml
index 2d0719460..7bc39d6de 100644
--- a/Components.toml
+++ b/Components.toml
@@ -1,6 +1,6 @@
 # template
 [components]
-nix = { name = "aster-nix" }
+kernel = { name = "aster-kernel" }
 virtio = { name = "aster-virtio" }
 input = { name = "aster-input" }
 block = { name = "aster-block" }
diff --git a/distro/aster_nixos_installer/default.nix b/distro/aster_nixos_installer/default.nix
index 3deccf1a2..907f49f92 100644
--- a/distro/aster_nixos_installer/default.nix
+++ b/distro/aster_nixos_installer/default.nix
@@ -3,8 +3,8 @@
 , extra-trusted-public-keys ? "", pkgs ? import <nixpkgs> { } }:
 let
   aster-kernel = builtins.path {
-    name = "aster-nix-osdk-bin";
-    path = ../../target/osdk/iso_root/boot/aster-nix-osdk-bin;
+    name = "aster-kernel-osdk-bin";
+    path = ../../target/osdk/iso_root/boot/aster-kernel-osdk-bin;
   };
   etc-nixos = builtins.path { path = ../etc_nixos; };
 
diff --git a/distro/etc_nixos/modules/core.nix b/distro/etc_nixos/modules/core.nix
index 010e9bc88..2a231f6bc 100644
--- a/distro/etc_nixos/modules/core.nix
+++ b/distro/etc_nixos/modules/core.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, options, ... }:
 let
   kernel = builtins.path {
-    name = "aster-nix-osdk-bin";
+    name = "aster-kernel-osdk-bin";
     path = config.aster_nixos.kernel;
   };
   stage-1-init = pkgs.writeShellScript "stage-1-init" ''
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
index 3af5b38e1..f8fb85818 100644
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "aster-nix"
+name = "aster-kernel"
 version = "0.1.0"
 edition.workspace = true
 
diff --git a/kernel/comps/mlsdisk/src/os/mod.rs b/kernel/comps/mlsdisk/src/os/mod.rs
index 1724555b7..98ee7fa8a 100644
--- a/kernel/comps/mlsdisk/src/os/mod.rs
+++ b/kernel/comps/mlsdisk/src/os/mod.rs
@@ -57,7 +57,7 @@ impl CurrentThread {
 /// A `Condvar` (Condition Variable) is a synchronization primitive that can block threads
 /// until a certain condition becomes true.
 ///
-/// This is a copy from `aster-nix`.
+/// This is a copy from `aster-kernel`.
 pub struct Condvar {
     waitqueue: Arc<WaitQueue>,
     counter: SpinLock<Inner>,
diff --git a/tools/bump_version.sh b/tools/bump_version.sh
index 651476f85..921d62af3 100755
--- a/tools/bump_version.sh
+++ b/tools/bump_version.sh
@@ -156,7 +156,7 @@ update_project_dependencies() {
     update_dep_version ${OSDK_CARGO_TOML_PATH} linux-bzimage-builder
 
     # Automatically bump Cargo.lock files
-    cargo update -p aster-nix --precise $new_version # For Cargo.lock
+    cargo update -p aster-kernel --precise $new_version # For Cargo.lock
     cd ${OSDK_DIR} && cargo update -p cargo-osdk --precise $new_version # For osdk/Cargo.lock
 }