replica
/
firesim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to checking for directory contents in chipyard rather than 

relying on git submodule status (which reports that chipyard is
initialized, even when it was skipped).
This commit is contained in:
Nathan Pemberton 2020-01-28 17:53:59 -05:00
parent d5d9a9c41b
commit ec0eb8dcaf
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build-setup-nolog.sh
View File

@ -61,13 +61,18 @@ do
shift shift
done done
# Disable the Chipyard submodule initially, and enable if we're not in library mode
git config submodule.target-design/chipyard.update none git config submodule.target-design/chipyard.update none
git submodule update --init --recursive #--jobs 8 git submodule update --init --recursive #--jobs 8
if [ "$IS_LIBRARY" = false ]; then if [ "$IS_LIBRARY" = false ]; then
# 0 if this is the first time chipyard is initialized, 1 if it's being re-initialized # Detect if the chipyard submodule is being initialized for the first time (true)
first_init=$(git submodule status target-design/chipyard | grep -q "^-"; echo $?) # or being re-initialized (false). Note that 'git submodule status' is
# wrong when the module was skipped via 'chipyard.update none'.
if [ `ls -1A target-design/chipyard | wc -l` -eq 0 ]; then
first_init=true
else
first_init=false
fi
git config --unset submodule.target-design/chipyard.update git config --unset submodule.target-design/chipyard.update
git submodule update --init target-design/chipyard git submodule update --init target-design/chipyard
@ -79,7 +84,7 @@ if [ "$IS_LIBRARY" = false ]; then
# If this is a fresh init of chipyard, we can safely overwrite the marshal # If this is a fresh init of chipyard, we can safely overwrite the marshal
# config, otherwise we have to assume the user might have changed it # config, otherwise we have to assume the user might have changed it
marshal_cfg=$RDIR/target-design/chipyard/software/firemarshal/marshal-config.yaml marshal_cfg=$RDIR/target-design/chipyard/software/firemarshal/marshal-config.yaml
if [ $first_init -eq 0 ]; then if [ $first_init = true ]; then
echo "firesim-dir: '../../../../'" > $marshal_cfg echo "firesim-dir: '../../../../'" > $marshal_cfg
fi fi
fi fi