synit
/
synit
1
0
Fork 1
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Bring synit-pid1 up-to-date

This commit is contained in:
Tony Garnock-Jones 2024-03-01 16:39:37 +01:00
parent ed7fb0b676
commit fc1be0badf
4 changed files with 337 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

568
synit-pid1/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

14
synit-pid1/Cargo.toml
View File

@ -23,12 +23,10 @@ strip = true
# syndicate-macros = { path = "localdev/syndicate-rs/syndicate-macros" }
[dependencies]
syndicate = "0.30"
syndicate-macros = "0.25"
syndicate = "0.34"
syndicate-macros = "0.27"
clap = "=3.0.0-beta.2"
clap_generate = "=3.0.0-beta.2"
clap_derive = "=3.0.0-beta.2"
nix = "^0.22"
tokio = { version = "1.10.0", features = ["process", "signal"] }
tracing = "0.1.14"
clap = { version = "4.5", features = ["derive"] }
nix = { version = "0.28", features = ["reboot", "signal", "fs"] }
tokio = { version = "1.36", features = ["process", "signal"] }
tracing = "0.1.40"

10
synit-pid1/Makefile
View File

@ -4,18 +4,14 @@ all:
x86_64-binary: x86_64-binary-release
x86_64-binary-release:
cross build --target=x86_64-unknown-linux-musl --release --all-targets
CARGO_TARGET_DIR=target/target.x86_64 cross build --target=x86_64-unknown-linux-musl --release --all-targets
armv7-binary: armv7-binary-release
armv7-binary-release:
cross build --target=armv7-unknown-linux-musleabihf --release --all-targets
# Hack to workaround https://github.com/rust-embedded/cross/issues/598
HACK_WORKAROUND_ISSUE_598=CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C link-arg=/usr/local/aarch64-linux-musl/lib/libc.a"
CARGO_TARGET_DIR=target/target.armv7 cross build --target=armv7-unknown-linux-musleabihf --release --all-targets
aarch64-binary: aarch64-binary-release
aarch64-binary-release:
$(HACK_WORKAROUND_ISSUE_598) \
cross build --target=aarch64-unknown-linux-musl --release --all-targets
CARGO_TARGET_DIR=target/target.aarch64 cross build --target=aarch64-unknown-linux-musl --release --all-targets

10
synit-pid1/src/main.rs
View File

@ -1,4 +1,4 @@
use clap::Clap;
use clap::Parser;
use nix::sys::reboot::{reboot, RebootMode};
use nix::sys::signal::{kill, Signal, SigHandler};
@ -19,13 +19,13 @@ use tokio::process;
use tokio::select;
use tokio::signal::unix::{signal, SignalKind};
#[derive(Clap, Clone, Debug)]
#[clap(version)]
#[derive(Parser, Clone, Debug)]
#[command(version)]
pub struct CommandLine {
#[clap(long, default_value="/usr/bin/syndicate-server")]
#[arg(long, default_value="/usr/bin/syndicate-server")]
server_path: String,
#[clap(long, default_value="/sbin/synit-log")]
#[arg(long, default_value="/sbin/synit-log")]
log: String,
}