Skip to content

Commit

Permalink
Build oak_linux_boot_params with Bazel.
Browse files Browse the repository at this point in the history
Also, move directory linux_boot_params to oak_linux_boot_params to match the crate name as we do with most other crates.

Change-Id: Ieec6300d8f8b06f5a17ed177bbda01f49852b69f
  • Loading branch information
ernoc committed Apr 9, 2024
1 parent 60435b9 commit 94d15d9
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace]
resolver = "2"
members = [
"linux_boot_params",
"oak_linux_boot_params",
"micro_rpc",
"micro_rpc_build",
"micro_rpc_tests",
Expand Down Expand Up @@ -117,7 +117,7 @@ oak_functions_test_utils = { path = "./oak_functions_test_utils" }
oak_functions_wasm = { path = "./oak_functions/wasm" }
oak_grpc_utils = { path = "./oak_grpc_utils" }
oak_launcher_utils = { path = "./oak_launcher_utils" }
oak_linux_boot_params = { path = "./linux_boot_params" }
oak_linux_boot_params = { path = "./oak_linux_boot_params" }
oak_logger = { path = "./oak_functions/logger" }
oak_proto_rust = { path = "./oak_proto_rust" }
oak_restricted_kernel_dice = { path = "./oak_restricted_kernel_dice" }
Expand Down
33 changes: 33 additions & 0 deletions oak_linux_boot_params/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#
# Copyright 2024 The Project Oak Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

load("@rules_rust//rust:defs.bzl", "rust_library")

package(
default_visibility = ["//visibility:public"],
licenses = ["notice"],
)

rust_library(
name = "oak_linux_boot_params",
srcs = glob(["src/**"]),
deps = [
"@oak_crates_index//:bitflags",
"@oak_crates_index//:static_assertions",
"@oak_crates_index//:strum",
"@oak_crates_index//:zerocopy",
],
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion oak_restricted_kernel_bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ members = ["."]

[dependencies]
log = "*"
oak_linux_boot_params = { path = "../linux_boot_params" }
oak_linux_boot_params = { path = "../oak_linux_boot_params" }
oak_restricted_kernel = { path = "../oak_restricted_kernel", default-features = false }

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion oak_restricted_kernel_wrapper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ members = ["."]

[dependencies]
elf = { version = "*", default-features = false }
oak_linux_boot_params = { path = "../linux_boot_params" }
oak_linux_boot_params = { path = "../oak_linux_boot_params" }
x86_64 = "*"

[profile.dev]
Expand Down
2 changes: 1 addition & 1 deletion stage0/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ linked_list_allocator = { version = "*", features = ["alloc_ref"] }
oak_core = { path = "../oak_core", default-features = false }
oak_dice = { workspace = true }
oak_stage0_dice = { workspace = true }
oak_linux_boot_params = { path = "../linux_boot_params" }
oak_linux_boot_params = { path = "../oak_linux_boot_params" }
oak_sev_guest = { workspace = true, features = ["rust-crypto"] }
oak_sev_snp_attestation_report = { workspace = true }
p256 = { version = "*", default-features = false, features = ["ecdsa"] }
Expand Down
2 changes: 1 addition & 1 deletion testing/sev_snp_hello_world_kernel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ members = ["."]
lazy_static = { version = "*", features = ["spin_no_std"] }
lock_api = "*"
log = "*"
oak_linux_boot_params = { path = "../../linux_boot_params" }
oak_linux_boot_params = { path = "../../oak_linux_boot_params" }
spinning_top = "*"
x86_64 = "*"
oak_sev_guest = { path = "../../oak_sev_guest", default-features = false }
Expand Down

0 comments on commit 94d15d9

Please sign in to comment.