From 3f1fa33b13817816fff0a386afb07257dc23e76f Mon Sep 17 00:00:00 2001 From: Zhang Junyang Date: Wed, 16 Oct 2024 01:21:38 +0800 Subject: [PATCH] Bump and publish linux-bzimage crate series with OSTD and OSDK --- osdk/Cargo.toml | 9 +-------- osdk/src/commands/build/bin.rs | 5 ++--- ostd/Cargo.toml | 2 +- ostd/libs/linux-bzimage/setup/Cargo.toml | 2 +- tools/bump_version.sh | 9 +++++++++ tools/github_workflows/publish_osdk_and_ostd.sh | 3 +++ 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/osdk/Cargo.toml b/osdk/Cargo.toml index 05487ef4..f884dd98 100644 --- a/osdk/Cargo.toml +++ b/osdk/Cargo.toml @@ -9,15 +9,8 @@ repository = "https://github.com/asterinas/asterinas" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[dependencies.linux-bzimage-builder] -# The path for local development -path = "../ostd/libs/linux-bzimage/builder" -# The version specified here is used for publishing on crates.io. -# Please update this version when publishing the cargo-osdk crate -# if there have been any changes to the dependent crate. -version = "0.2.0" - [dependencies] +linux-bzimage-builder = { version = "0.2.0", path = "../ostd/libs/linux-bzimage/builder" } clap = { version = "4.4.17", features = ["cargo", "derive"] } chrono = "0.4.38" env_logger = "0.11.0" diff --git a/osdk/src/commands/build/bin.rs b/osdk/src/commands/build/bin.rs index e65d0fda..042a2bd2 100644 --- a/osdk/src/commands/build/bin.rs +++ b/osdk/src/commands/build/bin.rs @@ -205,10 +205,9 @@ fn install_setup_with_arch( let crate_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); let setup_dir = crate_dir.join("../ostd/libs/linux-bzimage/setup"); cmd.arg("--path").arg(setup_dir); + } else { + cmd.arg("--version").arg(env!("CARGO_PKG_VERSION")); } - // Remember to upgrade this version if new version of linux-bzimage-setup is released. - const LINUX_BZIMAGE_SETUP_VERSION: &str = "0.1.0"; - cmd.arg("--version").arg(LINUX_BZIMAGE_SETUP_VERSION); cmd.arg("--target").arg(match arch { SetupInstallArch::X86_64 => "x86_64-unknown-none", SetupInstallArch::Other(path) => path.to_str().unwrap(), diff --git a/ostd/Cargo.toml b/ostd/Cargo.toml index e5d21aed..29430e91 100644 --- a/ostd/Cargo.toml +++ b/ostd/Cargo.toml @@ -28,7 +28,7 @@ inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-ma int-to-c-enum = { path = "../kernel/libs/int-to-c-enum", version = "0.1.0" } intrusive-collections = { version = "0.9.6", features = ["nightly"] } lazy_static = { version = "1.0", features = ["spin_no_std"] } -linux-boot-params = { path = "libs/linux-bzimage/boot-params", version = "0.1.0" } +linux-boot-params = { version = "0.1.0", path = "libs/linux-bzimage/boot-params" } log = "0.4" num = { version = "0.4", default-features = false } num-derive = { version = "0.4", default-features = false } diff --git a/ostd/libs/linux-bzimage/setup/Cargo.toml b/ostd/libs/linux-bzimage/setup/Cargo.toml index a93679b8..41f70bc9 100644 --- a/ostd/libs/linux-bzimage/setup/Cargo.toml +++ b/ostd/libs/linux-bzimage/setup/Cargo.toml @@ -16,7 +16,7 @@ path = "src/main.rs" cfg-if = "1.0.0" core2 = { version = "0.4.0", default-features = false, features = ["nightly"] } libflate = { version = "2.1.0", default-features = false } -linux-boot-params = { path = "../boot-params", version = "0.1.0" } +linux-boot-params = { version = "0.1.0", path = "../boot-params" } uart_16550 = "0.3.0" xmas-elf = "0.9.1" diff --git a/tools/bump_version.sh b/tools/bump_version.sh index c9200674..c424e0b5 100755 --- a/tools/bump_version.sh +++ b/tools/bump_version.sh @@ -106,6 +106,9 @@ DOCS_DIR=${ASTER_SRC_DIR}/docs OSTD_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/Cargo.toml OSTD_TEST_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/ostd-test/Cargo.toml OSTD_MACROS_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/ostd-macros/Cargo.toml +LINUX_BOOT_PARAMS_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/boot-params/Cargo.toml +LINUX_BZIMAGE_BUILDER_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/builder/Cargo.toml +LINUX_BZIMAGE_SETUP_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/setup/Cargo.toml OSDK_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/Cargo.toml OSDK_TEST_RUNNER_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/test-kernel/Cargo.toml VERSION_PATH=${ASTER_SRC_DIR}/VERSION @@ -125,11 +128,17 @@ new_version=$(bump_version ${current_version}) update_package_version ${OSTD_TEST_CARGO_TOML_PATH} update_package_version ${OSTD_MACROS_CARGO_TOML_PATH} update_package_version ${OSTD_CARGO_TOML_PATH} +update_package_version ${LINUX_BOOT_PARAMS_CARGO_TOML_PATH} +update_package_version ${LINUX_BZIMAGE_BUILDER_CARGO_TOML_PATH} +update_package_version ${LINUX_BZIMAGE_SETUP_CARGO_TOML_PATH} update_dep_version ${OSTD_CARGO_TOML_PATH} ostd-test +update_dep_version ${OSTD_CARGO_TOML_PATH} linux-boot-params update_dep_version ${OSTD_CARGO_TOML_PATH} ostd-macros +update_dep_version ${LINUX_BZIMAGE_SETUP_CARGO_TOML_PATH} linux-boot-params update_package_version ${OSDK_CARGO_TOML_PATH} update_package_version ${OSDK_TEST_RUNNER_CARGO_TOML_PATH} update_dep_version ${OSDK_TEST_RUNNER_CARGO_TOML_PATH} ostd +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 diff --git a/tools/github_workflows/publish_osdk_and_ostd.sh b/tools/github_workflows/publish_osdk_and_ostd.sh index 58b62212..ef121080 100755 --- a/tools/github_workflows/publish_osdk_and_ostd.sh +++ b/tools/github_workflows/publish_osdk_and_ostd.sh @@ -60,6 +60,8 @@ do_publish_for() { } do_publish_for osdk +do_publish_for ostd/libs/linux-bzimage/build +do_publish_for ostd/libs/linux-bzimage/boot-params # All supported targets of OSTD, this array should keep consistent with # `package.metadata.docs.rs.targets` in `ostd/Cargo.toml`. @@ -67,6 +69,7 @@ TARGETS="x86_64-unknown-none" for TARGET in $TARGETS; do do_publish_for ostd/libs/ostd-macros $TARGET do_publish_for ostd/libs/ostd-test $TARGET + do_publish_for ostd/libs/linux-bzimage/setup $TARGET do_publish_for ostd $TARGET do_publish_for osdk/test-kernel $TARGET