vendored openssl for arm64 build

This commit is contained in:
notplants 2025-05-27 17:20:53 -04:00
parent bc190051db
commit 9930d690ab
4 changed files with 1283 additions and 1016 deletions

2281
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
[workspace]
members = [
"peach-oled",
# "peach-oled",
"peach-lib",
"peach-config",
"peach-network",

View File

@ -53,3 +53,4 @@ jsonrpc_client = { version = "0.7", features = ["macros", "reqwest"] }
reqwest = "0.11.24"
urlencoding = "2.1.3"
rpassword = "5.0"
openssl = { version = '0.10', features = ["vendored"] }

View File

@ -31,13 +31,14 @@ echo "ARGS: $ARGS"
[ -n "$NETWORK_KEY" ] && echo "NETWORK_KEY: $NETWORK_KEY"
[ -n "$DATABASE_DIRECTORY" ] && echo "DATABASE_DIRECTORY: $DATABASE_DIRECTORY"
CMD="\"$TILDEFRIENDS_PATH\" run"
[ -n "$ARGS" ] && CMD="$CMD -a \"$ARGS\""
[ -n "$NETWORK_KEY" ] && CMD="$CMD -k \"$NETWORK_KEY\""
[ -n "$DATABASE_DIRECTORY" ] && CMD="$CMD -d \"$DATABASE_DIRECTORY/db.sqlite\""
# build and exec the command
CMD=("$TILDEFRIENDS_PATH" run)
[ -n "$ARGS" ] && CMD+=(-a "$ARGS")
[ -n "$NETWORK_KEY" ] && CMD+=(-k "$NETWORK_KEY")
[ -n "$DATABASE_DIRECTORY" ] && CMD+=(-d "$DATABASE_DIRECTORY/db.sqlite")
echo "Running command:"
echo "$CMD"
printf "%q " "${CMD[@]}"
echo
# Execute the command
eval $CMD
exec "${CMD[@]}"