From 66e7d2c703fa8f0258b89cc9489b7f1a4bc3f1b9 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Tue, 28 Sep 2021 12:33:40 -0600
Subject: [PATCH] misc fixes

---
 appmgr/Cargo.lock             | 15 +--------------
 appmgr/Cargo.toml             |  4 +++-
 appmgr/build-dev.sh           |  8 +++++---
 appmgr/build-portable-dev.sh  | 15 +++++++++++++++
 appmgr/src/install/cleanup.rs |  6 +++++-
 patch-db                      |  2 +-
 6 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100755 appmgr/build-portable-dev.sh

diff --git a/appmgr/Cargo.lock b/appmgr/Cargo.lock
index b52d2a2b0..023773bc5 100644
--- a/appmgr/Cargo.lock
+++ b/appmgr/Cargo.lock
@@ -1660,19 +1660,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nix"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8e5e343312e7fbeb2a52139114e9e702991ef9c2aea6817ff2440b35647d56"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 1.0.0",
- "libc",
- "memoffset",
-]
-
 [[package]]
 name = "nix"
 version = "0.22.1"
@@ -1930,7 +1917,7 @@ dependencies = [
  "json-ptr",
  "lazy_static",
  "log",
- "nix 0.20.1",
+ "nix 0.22.1",
  "patch-db-macro",
  "serde",
  "serde_cbor 0.11.1",
diff --git a/appmgr/Cargo.toml b/appmgr/Cargo.toml
index da6210189..2f234794e 100644
--- a/appmgr/Cargo.toml
+++ b/appmgr/Cargo.toml
@@ -76,7 +76,9 @@ nix = "0.22.1"
 num = "0.4.0"
 openssh-keys = "0.5.0"
 openssl = { version = "0.10.36", features = ["vendored"] }
-patch-db = { version = "*", path = "../patch-db/patch-db", features = ["log"] }
+patch-db = { version = "*", path = "../patch-db/patch-db", features = [
+  "debug",
+] }
 pbkdf2 = "0.9.0"
 pin-project = "1.0.8"
 prettytable-rs = "0.8.0"
diff --git a/appmgr/build-dev.sh b/appmgr/build-dev.sh
index ea38a6f13..ded9d7571 100755
--- a/appmgr/build-dev.sh
+++ b/appmgr/build-dev.sh
@@ -8,7 +8,9 @@ if [ "$0" != "./build-dev.sh" ]; then
 	exit 1
 fi
 
-alias 'rust-arm-builder'='docker run --rm -it -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:latest'
+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-arm-builder sh -c "(cd appmgr && cargo build)"
+cd ../..
+rust-arm64-builder sh -c "(cd embassy-os/appmgr && cargo build)"
+cd embassy-os/appmgr
+#rust-arm64-builder aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/embassyd
diff --git a/appmgr/build-portable-dev.sh b/appmgr/build-portable-dev.sh
new file mode 100755
index 000000000..c59f885e9
--- /dev/null
+++ b/appmgr/build-portable-dev.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+shopt -s expand_aliases
+
+if [ "$0" != "./build-portable-dev.sh" ]; then
+	>&2 echo "Must be run from appmgr directory"
+	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'
+
+cd ../..
+rust-musl-builder sh -c "(cd embassy-os/appmgr && cargo +beta build --target=x86_64-unknown-linux-musl --no-default-features)"
+cd embassy-os/appmgr
diff --git a/appmgr/src/install/cleanup.rs b/appmgr/src/install/cleanup.rs
index de5019897..1b8b25a48 100644
--- a/appmgr/src/install/cleanup.rs
+++ b/appmgr/src/install/cleanup.rs
@@ -100,7 +100,11 @@ pub async fn cleanup(ctx: &RpcContext, id: &PackageId, version: &Version) -> Res
         ctx.docker.remove_image(&image.id, None, None).await
     }))
     .await?;
-    let docker_path = ctx.datadir.join(id).join(version.as_str());
+    let docker_path = ctx
+        .datadir
+        .join(PKG_DOCKER_DIR)
+        .join(id)
+        .join(version.as_str());
     if tokio::fs::metadata(&docker_path).await.is_ok() {
         tokio::fs::remove_dir_all(&docker_path).await?;
     }
diff --git a/patch-db b/patch-db
index e442ae623..f0e6968a7 160000
--- a/patch-db
+++ b/patch-db
@@ -1 +1 @@
-Subproject commit e442ae62341a485d393e4ee8cf27cd910cb0bb36
+Subproject commit f0e6968a79e021c65e4c0e29a667b110c830237e