From be98fdfeed41288bb9024ff511d87494715c6a3d Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Mon, 27 Dec 2021 17:41:35 -0700 Subject: [PATCH] unstable flag --- appmgr/Cargo.toml | 1 + appmgr/build-prod.sh | 6 +++++- build/write-image.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/appmgr/Cargo.toml b/appmgr/Cargo.toml index a03abc465..7ec899510 100644 --- a/appmgr/Cargo.toml +++ b/appmgr/Cargo.toml @@ -41,6 +41,7 @@ avahi = ["avahi-sys"] default = ["avahi", "sound", "metal"] metal = [] sound = [] +unstable = ["patch-db/unstable"] [dependencies] aes = { version = "0.7.5", features = ["ctr"] } diff --git a/appmgr/build-prod.sh b/appmgr/build-prod.sh index 109dd805b..13cffc55b 100755 --- a/appmgr/build-prod.sh +++ b/appmgr/build-prod.sh @@ -11,6 +11,10 @@ fi alias 'rust-arm64-builder'='docker run --rm -it -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:aarch64' cd .. -rust-arm64-builder sh -c "(cd appmgr && cargo build --release)" +if [[ "$ENVIRONMENT" =~ (^|-)unstable($|-) ]]; then + rust-arm64-builder sh -c "(cd appmgr && cargo build --release --features unstable)" +else + rust-arm64-builder sh -c "(cd appmgr && cargo build --release)" +fi cd appmgr #rust-arm64-builder aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/embassyd diff --git a/build/write-image.sh b/build/write-image.sh index bf692d58e..2fe4a673d 100755 --- a/build/write-image.sh +++ b/build/write-image.sh @@ -64,7 +64,7 @@ sudo cp -R diagnostic-ui/www /tmp/eos-mnt/var/www/html/diagnostic # Make the .ssh directory sudo mkdir -p /tmp/eos-mnt/root/.ssh -if [ "$ENVIRONMENT" = "dev" ]; then +if [[ "$ENVIRONMENT" =~ (^|-)dev($|-) ]]; then cat ./build/initialization.sh | grep -v "passwd -l ubuntu" | sudo tee /tmp/eos-mnt/usr/local/bin/initialization.sh > /dev/null sudo chmod +x /tmp/eos-mnt/usr/local/bin/initialization.sh else