From ca2492d12938022d6715b8d3426923437a86252f Mon Sep 17 00:00:00 2001
From: Polprzewodnikowy <sc@mateuszfaderewski.pl>
Date: Sun, 15 May 2022 18:02:02 +0200
Subject: [PATCH] final fix

---
 .github/workflows/main.yml    |   8 ++++----
 build.sh                      |   2 +-
 docker_build.sh               |   3 ++-
 {cfg => fw}/ftdi_template.xml | Bin
 fw/project/lcmxo2/build.sh    |   1 -
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename {cfg => fw}/ftdi_template.xml (100%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 320601b..708ec6a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,8 +37,8 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: SummerCart64
-          path: SummerCart64.zip
+          name: SC64
+          path: SC64.zip
 
       - name: Get release
         if: github.event_name == 'release' && github.event.action == 'created'
@@ -54,6 +54,6 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.get_release.outputs.upload_url }}
-          asset_path: SummerCart64.zip
-          asset_name: SummerCart64.zip
+          asset_path: SC64.zip
+          asset_name: SC64.zip
           asset_content_type: application/zip
diff --git a/build.sh b/build.sh
index bc13443..c2fcf82 100755
--- a/build.sh
+++ b/build.sh
@@ -5,9 +5,9 @@ set -e
 PACKAGE_FILE_NAME="SC64"
 
 FILES=(
+    "./fw/ftdi-template.xml"
     "./fw/project/lcmxo2/impl1/sc64_impl1.bit"
     "./fw/project/lcmxo2/impl1/sc64_impl1.jed"
-    "./hw/ftdi-template.xml"
     "./sw/bootloader/build/bootloader.bin"
     "./sw/controller/build/controller.bin"
     "./sw/controller/build/controller.elf"
diff --git a/docker_build.sh b/docker_build.sh
index 0453ab1..389a8e0 100755
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUILDER_IMAGE="ghcr.io/polprzewodnikowy/sc64env:v1.4"
+BUILDER_IMAGE="ghcr.io/polprzewodnikowy/sc64env:v1.5"
 
 pushd $(dirname $0) > /dev/null
 
@@ -15,6 +15,7 @@ fi
 docker run \
     $DOCKER_OPTIONS \
     --rm \
+    --user $(id -u):$(id -g) \
     --mac-address ${MAC_ADDRESS:-F8:12:34:56:78:90} \
     --mount type=bind,src="$(pwd)/flexlm",target="/flexlm" \
     --mount type=bind,src="$(pwd)",target="/workdir" \
diff --git a/cfg/ftdi_template.xml b/fw/ftdi_template.xml
similarity index 100%
rename from cfg/ftdi_template.xml
rename to fw/ftdi_template.xml
diff --git a/fw/project/lcmxo2/build.sh b/fw/project/lcmxo2/build.sh
index 57cc1f6..35a8b44 100755
--- a/fw/project/lcmxo2/build.sh
+++ b/fw/project/lcmxo2/build.sh
@@ -2,5 +2,4 @@
 
 source $bindir/diamond_env
 
-yum remove -y libusb
 diamondc build.tcl