From 40276ceaa4736438d71a6ec4609d5fc5f21b82c9 Mon Sep 17 00:00:00 2001
From: Ashton Snelgrove <ashton.snelgrove@utah.edu>
Date: Fri, 22 Jan 2021 16:27:55 -0700
Subject: [PATCH] Move openfpga binary to matching location.

---
 .dockerignore               | 3 ---
 .github/workflows/build.yml | 2 +-
 docker/Dockerfile.master    | 8 ++++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 9e7f0d3bb..becc94088 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -12,8 +12,6 @@ libs
 LICENSE
 Makefile
 openfpga
-openfpga_flow
-openfpga.sh
 README.md
 run_local.bat
 run_local.sh
@@ -30,4 +28,3 @@ yosys
 !yosys/yosys-filterlib
 !yosys/yosys-smtbmc
 !yosys/share
-!openfpga_flow
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41c6e10a6..e232c32ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -254,7 +254,7 @@ jobs:
         run: |
           cp /opt/openfpga/abc/abc abc/abc
           cp /opt/openfpga/ace2/ace ace2/ace
-          cp /opt/openfpga/openfpga openfpga/openfpga
+          cp /opt/openfpga/openfpga/openfpga openfpga/openfpga
           cp /opt/openfpga/vpr/vpr vpr/vpr
           cp /opt/openfpga/yosys/yosys yosys/yosys
           cp /opt/openfpga/yosys/yosys-abc yosys/yosys-abc
diff --git a/docker/Dockerfile.master b/docker/Dockerfile.master
index 90518c1eb..3ac9c07a1 100644
--- a/docker/Dockerfile.master
+++ b/docker/Dockerfile.master
@@ -1,6 +1,6 @@
 FROM ghcr.io/lnis-uofu/openfpga-env
-RUN mkdir /opt/openfpga /opt/openfpga/abc /opt/openfpga/ace2 /opt/openfpga/vpr /opt/openfpga/yosys
-COPY openfpga/openfpga /opt/openfpga/openfpga
+RUN mkdir /opt/openfpga /opt/openfpga/openfpga /opt/openfpga/abc /opt/openfpga/ace2 /opt/openfpga/vpr /opt/openfpga/yosys
+COPY openfpga/openfpga /opt/openfpga/openfpga/openfpga
 COPY abc/abc /opt/openfpga/abc/
 COPY ace2/ace /opt/openfpga/ace2/
 COPY vpr/vpr /opt/openfpga/vpr/
@@ -8,6 +8,6 @@ COPY yosys/yosys yosys/yosys-abc yosys/yosys-config yosys/yosys-filterlib yosys/
 COPY yosys/share /opt/openfpga/yosys/share
 RUN cd /opt/openfpga && chmod +x abc/abc ace2/ace openfpga vpr/vpr yosys/yosys yosys/yosys-abc yosys/yosys-config yosys/yosys-filterlib yosys/yosys-smtbmc
 COPY openfpga_flow /opt/openfpga/openfpga_flow
-ENV PATH="/opt/openfpga:/opt/openfpga/yosys:/opt/openfpga/ace2:/opt/openfpga/abc:/opt/openfpga/vpr:${PATH}"
+ENV PATH="/opt/openfpga/openfpga:/opt/openfpga/yosys:/opt/openfpga/ace2:/opt/openfpga/abc:/opt/openfpga/vpr:${PATH}"
 ENV OPENFPGA_PATH="/opt/openfpga:${PATH}"
-WORKDIR /opt/openfpga
\ No newline at end of file
+WORKDIR /opt/openfpga