From 614cc356236cae2ad89e5580b06d3e0d151b4755 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Sat, 13 Nov 2021 13:29:03 +0100
Subject: [PATCH] Use straightforward x86_64 build method (instead of a silly
 method)

---
 packaging/packages/synit-pid1/APKBUILD               | 2 +-
 packaging/packages/synit-pid1/src/synit-pid1.aarch64 | 1 +
 packaging/packages/synit-pid1/src/synit-pid1.armv7   | 1 +
 packaging/packages/synit-pid1/src/synit-pid1.x86_64  | 1 +
 synit-pid1/Makefile                                  | 8 +-------
 5 files changed, 5 insertions(+), 8 deletions(-)
 create mode 120000 packaging/packages/synit-pid1/src/synit-pid1.aarch64
 create mode 120000 packaging/packages/synit-pid1/src/synit-pid1.armv7
 create mode 120000 packaging/packages/synit-pid1/src/synit-pid1.x86_64

diff --git a/packaging/packages/synit-pid1/APKBUILD b/packaging/packages/synit-pid1/APKBUILD
index a32696c..775bd58 100644
--- a/packaging/packages/synit-pid1/APKBUILD
+++ b/packaging/packages/synit-pid1/APKBUILD
@@ -32,5 +32,5 @@ package() {
 sha512sums="
 4ab374c93e56d6f6935b2392abdefebce93f65b8dc0bf27d34aa2558b20f1a7755a555d9431ae8a5956dbcd1644f5cdf5db792db1c860e8ae6f2bb76968e3bbf  synit-pid1.aarch64
 a02841e813acb307dacc1d8612e87c51f70188138d89918468733797744beca0d523a8c23ddc7fbde6a1289a00875b9b014bd18f232b05ddbd9830aec9b1ac7e  synit-pid1.armv7
-2328797625b9e8d0a2b98034b8a17cf00b2ed8d5d4f2bbff6d1fb41104c98a575d5b1ceaf9015096a5c1259698366c16cda562057df7efd65fb36f9e67e29978  synit-pid1.x86_64
+5cbfeca71232c7fbf3b7693ab3397f3e506c1de21fb413aa1f4fb2b384525fe1d9945d60329a1567dde9c21058d203fd973301703fe1e203319e4009449f2012  synit-pid1.x86_64
 "
diff --git a/packaging/packages/synit-pid1/src/synit-pid1.aarch64 b/packaging/packages/synit-pid1/src/synit-pid1.aarch64
new file mode 120000
index 0000000..1e11d13
--- /dev/null
+++ b/packaging/packages/synit-pid1/src/synit-pid1.aarch64
@@ -0,0 +1 @@
+/data/packages/synit-pid1/synit-pid1.aarch64
\ No newline at end of file
diff --git a/packaging/packages/synit-pid1/src/synit-pid1.armv7 b/packaging/packages/synit-pid1/src/synit-pid1.armv7
new file mode 120000
index 0000000..e130d85
--- /dev/null
+++ b/packaging/packages/synit-pid1/src/synit-pid1.armv7
@@ -0,0 +1 @@
+/data/packages/synit-pid1/synit-pid1.armv7
\ No newline at end of file
diff --git a/packaging/packages/synit-pid1/src/synit-pid1.x86_64 b/packaging/packages/synit-pid1/src/synit-pid1.x86_64
new file mode 120000
index 0000000..b1088f5
--- /dev/null
+++ b/packaging/packages/synit-pid1/src/synit-pid1.x86_64
@@ -0,0 +1 @@
+/data/packages/synit-pid1/synit-pid1.x86_64
\ No newline at end of file
diff --git a/synit-pid1/Makefile b/synit-pid1/Makefile
index 1e5fa33..162a83a 100644
--- a/synit-pid1/Makefile
+++ b/synit-pid1/Makefile
@@ -4,13 +4,7 @@ all:
 x86_64-binary: x86_64-binary-release
 
 x86_64-binary-release:
-	$(MAKE) -C ../packaging build-image.rust ARCH=x86_64
-	docker run -i --rm \
-		-v $(HOME)/.cargo:/home/build/.cargo \
-		-v `pwd`:/data \
-		-e CARGO_TARGET_DIR=target/x86_64-unknown-linux-musl \
-		synit-build-rust:x86_64 \
-		cargo build --release --all-targets
+	cross build --target=x86_64-unknown-linux-musl --release --all-targets
 
 armv7-binary: armv7-binary-release