diff --git a/backend/build-dev.sh b/backend/build-dev.sh index ec30ada93..cefbcbaa2 100755 --- a/backend/build-dev.sh +++ b/backend/build-dev.sh @@ -8,7 +8,7 @@ if [ "$0" != "./build-dev.sh" ]; then exit 1 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' +alias 'rust-arm64-builder'='docker run --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:aarch64' cd .. rust-arm64-builder sh -c "(cd backend && cargo build)" diff --git a/backend/build-portable-dev.sh b/backend/build-portable-dev.sh index af12822cf..4289dd3b7 100755 --- a/backend/build-portable-dev.sh +++ b/backend/build-portable-dev.sh @@ -8,7 +8,7 @@ if [ "$0" != "./build-portable-dev.sh" ]; then exit 1 fi -alias 'rust-musl-builder'='docker run --rm -it -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' +alias 'rust-musl-builder'='docker run --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' cd .. rust-musl-builder sh -c "(cd backend && cargo +beta build --target=x86_64-unknown-linux-musl --no-default-features)" diff --git a/backend/build-portable.sh b/backend/build-portable.sh index bc8efe0b0..ab43eb754 100755 --- a/backend/build-portable.sh +++ b/backend/build-portable.sh @@ -8,7 +8,7 @@ if [ "$0" != "./build-portable.sh" ]; then exit 1 fi -alias 'rust-musl-builder'='docker run --rm -it -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' +alias 'rust-musl-builder'='docker run --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' cd .. rust-musl-builder sh -c "(cd backend && cargo +beta build --release --target=x86_64-unknown-linux-musl --no-default-features)" diff --git a/backend/build-prod.sh b/backend/build-prod.sh index cc10aae84..c9fb4ce5e 100755 --- a/backend/build-prod.sh +++ b/backend/build-prod.sh @@ -8,7 +8,7 @@ if [ "$0" != "./build-prod.sh" ]; then exit 1 fi -alias 'rust-arm64-builder'='docker run --rm -it -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -P start9/rust-arm-cross:aarch64' +alias 'rust-arm64-builder'='docker run --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -P start9/rust-arm-cross:aarch64' cd .. FLAGS="" diff --git a/build/make-image.sh b/build/make-image.sh index 0c2fb7fad..d0a01fcdc 100755 --- a/build/make-image.sh +++ b/build/make-image.sh @@ -30,7 +30,7 @@ fi export LOOPDEV=$(sudo losetup --show -fP raspios.img) ./build/partitioning.sh ./build/write-image.sh -sudo e2fsck -f `partition_for ${OUTPUT_DEVICE} 3` +sudo e2fsck -f -y `partition_for ${OUTPUT_DEVICE} 3` sudo resize2fs -M `partition_for ${OUTPUT_DEVICE} 3` BLOCK_INFO=$(sudo dumpe2fs `partition_for ${OUTPUT_DEVICE} 3`) BLOCK_COUNT=$(echo "$BLOCK_INFO" | grep "Block count:" | sed 's/Block count:\s\+//g') diff --git a/system-images/compat/build.sh b/system-images/compat/build.sh index 375c616ea..e7d937c7f 100755 --- a/system-images/compat/build.sh +++ b/system-images/compat/build.sh @@ -8,7 +8,7 @@ if [ "$0" != "./build.sh" ]; then exit 1 fi -alias 'rust-musl-builder'='docker run --rm -it -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:aarch64-musl' +alias 'rust-musl-builder'='docker run --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:aarch64-musl' cd ../../.. rust-musl-builder sh -c "(cd embassy-os/system-images/compat && cargo +beta build --release --target=aarch64-unknown-linux-musl --no-default-features)"