From b1d0bd4944670d74a9b5f0c47c34b6f1cc56705a Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Mon, 3 Apr 2023 12:40:03 +0100
Subject: [PATCH] SOC1-124: Updated flow to work with bash
---
CHIPKIT | 2 +-
accelerator-wrapper | 2 +-
set_env.sh | 4 +++-
sha-2-accelerator | 2 +-
socsim | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/CHIPKIT b/CHIPKIT
index 2435cd9..dacc3b7 160000
--- a/CHIPKIT
+++ b/CHIPKIT
@@ -1 +1 @@
-Subproject commit 2435cd9df8ff8a7e7d2e289b4e646eed10882e27
+Subproject commit dacc3b76ea88cac52cec96a79f66f58efb852c09
diff --git a/accelerator-wrapper b/accelerator-wrapper
index b29111d..2d3bead 160000
--- a/accelerator-wrapper
+++ b/accelerator-wrapper
@@ -1 +1 @@
-Subproject commit b29111dad3d10ea9499f63f39ba8536b21f51355
+Subproject commit 2d3beadf82bf46dab66c78455ff7f1afb67232b4
diff --git a/set_env.sh b/set_env.sh
index 6fa88ed..9d7f402 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -10,6 +10,7 @@
#-----------------------------------------------------------------------------
#!/bin/bash
+echo "set_env root"
# Get Root Location of Design Structure
if [ -z $DESIGN_ROOT ]; then
# If $DESIGN_ROOT hasn't been set yet
@@ -24,7 +25,7 @@ if [ -z $DESIGN_ROOT ]; then
source $DESIGN_ROOT/set_env.sh
else
# Set Environment Variable for this Repository
- export SOC_TOP_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+ export SOC_TOP_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# If this Repo is root of workspace
if [ $SOC_TOP_DIR = $DESIGN_ROOT ]; then
@@ -37,6 +38,7 @@ else
# Source environment variables for all submodules
for d in $SOC_TOP_DIR/* ; do
if [ -e "$d/.git" ]; then
+ echo $d
if [ -f "$d/set_env.sh" ]; then
# If .git file exists - submodule
source $d/set_env.sh
diff --git a/sha-2-accelerator b/sha-2-accelerator
index bbd478b..2dfadb8 160000
--- a/sha-2-accelerator
+++ b/sha-2-accelerator
@@ -1 +1 @@
-Subproject commit bbd478b94f719df99ade719c546cfad52dd24e40
+Subproject commit 2dfadb8f034a6fad85df20fe377441f299d0ba1d
diff --git a/socsim b/socsim
index f14cbe8..c44834a 160000
--- a/socsim
+++ b/socsim
@@ -1 +1 @@
-Subproject commit f14cbe8a2f6124b6bca3a6b23b5e735b715458b7
+Subproject commit c44834af2df7e02f797229f6d735da0d83d8ec80
--
GitLab