omarabdul3ziz/zosbuilder
1
0
Fork 0
forked from tfgrid/zosbuilder
Code Pull Requests Activity

Revert to own_built rfs

Browse Source 
- downloadable rfs doesn't include necessary tools
This commit is contained in:
Jan De Landtsheer
2025-09-08 16:52:17 +02:00
parent b7584bdb4e
commit acc2fce84a
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/lib/components.sh
View File

@@ -52,8 +52,8 @@ function components_parse_sources_conf() {
# Component 3: rfs (pre-built release)
component_count=$((component_count + 1))
log_info "Processing component ${component_count}: rfs (release)"
components_download_release "rfs" "https://github.com/threefoldtech/rfs/releases/download/v2.0.6/rfs" "v2.0.6" "$components_dir" ""
components_build_component "rfs" "install_rfs" "$components_dir"
components_download_git "rfs" "https://github.com/threefoldtech/rfs" "development" "$components_dir"
components_build_component "rfs" "build_rfs" "$components_dir"
# Component 4: corex
component_count=$((component_count + 1))
@@ -327,9 +327,10 @@ function build_rfs() {
log_error "Cargo.toml not found in: ${current_dir}"
return 1
fi
# remove rust-toolchain.toml, as not needed with latest release
safe_execute rm rust-toolchain.toml
# Build with musl target
safe_execute cargo build --release --target "$RUST_TARGET"
safe_execute cargo build --release --target "$RUST_TARGET" --features build-binary
# Find and install binary
local binary_path="target/${RUST_TARGET}/release/rfs"
@@ -441,7 +442,7 @@ function components_verify_installation() {
# List of expected built binaries and their locations in components directory
local expected_binaries=(
"zinit/target/x86_64-unknown-linux-musl/release/zinit"
"rfs/rfs"
"rfs/target/x86_64-unknown-linux-musl/release/rfs"
"mycelium/myceliumd/target/x86_64-unknown-linux-musl/release/mycelium"
"corex/corex"
)
@@ -497,4 +498,4 @@ export -f components_build_component components_setup_rust_env
export -f build_zinit build_rfs build_mycelium install_corex
export -f components_verify_installation components_cleanup
# Export functions for install_rfs
export -f install_rfs
export -f install_rfs