Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve transparent release binary filename issues #5004

Closed
wants to merge 5 commits into from
Closed

Resolve transparent release binary filename issues #5004

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d88839
Resolve transparent release binary naming issues
jul-sh Apr 5, 2024
d321b76
remove echo statement
jul-sh Apr 5, 2024
2a1e27a
preserve existing binary names
jul-sh Apr 5, 2024
babe915
fix typo
jul-sh Apr 5, 2024
4cda168
fix typo
jul-sh Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,29 @@ oak_restricted_kernel_bin:
env --chdir=oak_restricted_kernel_bin cargo build --release --bin=oak_restricted_kernel_bin

_wrap_kernel kernel_bin_prefix:
env --chdir=oak_restricted_kernel_wrapper OAK_RESTRICTED_KERNEL_FILE_NAME={{kernel_bin_prefix}}_bin cargo build --release
rust-objcopy --output-target=binary oak_restricted_kernel_wrapper/target/x86_64-unknown-none/release/oak_restricted_kernel_wrapper oak_restricted_kernel_wrapper/target/x86_64-unknown-none/release/{{kernel_bin_prefix}}_wrapper_bin
rm -rf oak_restricted_kernel_wrapper/target/released_bin_with_components_{{kernel_bin_prefix}}
mkdir -p oak_restricted_kernel_wrapper/target/released_bin_with_components_{{kernel_bin_prefix}}
cp \
oak_restricted_kernel_wrapper/target/x86_64-unknown-none/release/{{kernel_bin_prefix}}_wrapper_bin \
oak_restricted_kernel_wrapper/target/released_bin_with_components_{{kernel_bin_prefix}}/bzimage
#!/usr/bin/env bash
# This script builds and then wraps a kernel as a bzImage. It outputs the bzimage and its constituent parts for measurement.
KERNEL_BIN_PREFIX="{{kernel_bin_prefix}}"
OAK_WRAPPER_DIR="oak_restricted_kernel_wrapper"
BIN_DIR="${OAK_WRAPPER_DIR}/bin/${KERNEL_BIN_PREFIX}"
RUST_TARGET_DIR="${OAK_WRAPPER_DIR}/target/x86_64-unknown-none/release"
KERNEL_BIN_PATH="${RUST_TARGET_DIR}/oak_restricted_kernel_wrapper"

# Ensure clean state for the binaries. All binaries in "${BIN_DIR}" will be included in any provenances.
rm -rf "${BIN_DIR}"
mkdir -p "${BIN_DIR}"

# Wrap the kernel as a bzImage.
env --chdir="${OAK_WRAPPER_DIR}" OAK_RESTRICTED_KERNEL_FILE_NAME="${KERNEL_BIN_PREFIX}_bin" cargo build --release

# Copy the kernel binary to the designated location.
rust-objcopy --output-target=binary "${KERNEL_BIN_PATH}" "${BIN_DIR}/${KERNEL_BIN_PREFIX}_wrapper_bin"

# Process the kernel binary using oak_kernel_measurement.
cargo run --package oak_kernel_measurement -- \
--kernel=oak_restricted_kernel_wrapper/target/released_bin_with_components_{{kernel_bin_prefix}}/bzimage \
--kernel-setup-data-output=oak_restricted_kernel_wrapper/target/released_bin_with_components_{{kernel_bin_prefix}}/kernel_setup_data \
--kernel-image-output=oak_restricted_kernel_wrapper/target/released_bin_with_components_{{kernel_bin_prefix}}/kernel_image
--kernel="${BIN_DIR}/${KERNEL_BIN_PREFIX}_wrapper_bin" \
--kernel-setup-data-output="${BIN_DIR}/${KERNEL_BIN_PREFIX}_setup_data" \
--kernel-image-output="${BIN_DIR}/${KERNEL_BIN_PREFIX}_image"

oak_restricted_kernel_wrapper: oak_restricted_kernel_bin
just _wrap_kernel oak_restricted_kernel
Expand Down
4 changes: 2 additions & 2 deletions kokoro/build_binaries_rust.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ touch "${KOKORO_ARTIFACTS_DIR}/binaries/git_commit_${KOKORO_GIT_COMMIT_oak:?}"
# Copy the generated binaries to Placer. The timestamps are used to convey
# the creation time.
readonly generated_binaries=(
./oak_restricted_kernel_wrapper/target/x86_64-unknown-none/release/oak_restricted_kernel_simple_io_wrapper_bin
./oak_restricted_kernel_wrapper/target/x86_64-unknown-none/release/oak_restricted_kernel_simple_io_init_rd_wrapper_bin
./oak_restricted_kernel_wrapper/bin/oak_restricted_kernel_simple_io/oak_restricted_kernel_simple_io_bzimage
jul-sh marked this conversation as resolved.
Show resolved Hide resolved
./oak_restricted_kernel_wrapper/bin/oak_restricted_kernel_simple_io_init_rd/oak_restricted_kernel_simple_io_init_rd_bzimage
./oak_restricted_kernel_wrapper/cmd_line_regex.txt
./stage0_bin/target/x86_64-unknown-none/release/stage0_bin
./enclave_apps/target/x86_64-unknown-none/release/key_xor_test_app
Expand Down
Loading