Rename aster-nix to aster-kernel
This commit is contained in:
parent
bb9b979586
commit
33f370966d
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -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; };
|
||||
|
||||
|
|
|
|||
|
|
@ -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" ''
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
[package]
|
||||
name = "aster-nix"
|
||||
name = "aster-kernel"
|
||||
version = "0.1.0"
|
||||
edition.workspace = true
|
||||
|
||||
|
|
|
|||
|
|
@ -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>,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue