Minor build cleanup.

bin/install_verilator

@@ -17,6 +17,15 @@ fi
 mkdir -p local
 cd local
 
+if [[ -n "$(which apt-get 2> /dev/null)" ]]
+then
+  # Ubuntu
+  sudo apt-get install make autoconf g++ flex bison
+else [[ -n "$(which yum 2> /dev/null)" ]]
+  # Ubuntu
+  sudo yum install make autoconf g++ flex bison
+fi
+
 if [[ -e ./verilator ]]
 then
   echo "$(pwd)/verilator exists."

framework/build/Makefile

@@ -467,7 +467,7 @@ endif
 TLV=$(shell ls ../fpga/src/*.tlv 2> /dev/null)
 SV_SRC=$(shell ls ../fpga/src/*.sv ../fpga/src/*.v 2> /dev/null)
 VH_SRC=$(shell ls ../fpga/src/*.vh 2> /dev/null)
-FRAMEWORK_V_SRC=$(shell ls $(FRAMEWORK_DIR)/fpga/src/*.v $(FRAMEWORK_DIR)/fpga/src/*.sv $(FRAMEWORK_DIR)/fpga/src/*.vh)
+FRAMEWORK_V_SRC=$(shell ls $(FRAMEWORK_DIR)/fpga/src/*.v $(FRAMEWORK_DIR)/fpga/src/*.sv $(FRAMEWORK_DIR)/fpga/src/*.vh 2> /dev/null)
 TLVLIB=$(shell ls ../fpga/src/*.tlvlib 2> /dev/null)
 SV_FROM_TLV=$(patsubst ../fpga/src/%.tlv,../out/sv/%.sv,$(TLV))
 SP_CURL_FILES=$(patsubst ../fpga/src/%.tlvlib,-F 'files[]=@../../../fpga/src/%.tlvlib',$(TLVLIB))
@@ -669,7 +669,7 @@ $(USER_KERNEL_ADDED_FILE): $(SHELL_REP) $(SV_FROM_TLV)
 	@mkdir -p ../out/sv  # Must exist for add_kernel.tcl
 	@# Add sources to project.
 	echo 'remove_files *_example_adder.v' > '$(VIVADO_PROJ_SCRIPT)' \
-	  && echo "add_files $$(ls $(SV_SRC) $(VH_SRC) $(FRAMEWORK_V_SRC) ../out/sv/*.v ../out/sv/*.sv ../out/sv/*.vh | tr "\n" " ")" >> '$(VIVADO_PROJ_SCRIPT)'
+	  && echo "add_files $$(ls $(SV_SRC) $(VH_SRC) $(FRAMEWORK_V_SRC) ../out/sv/*.v ../out/sv/*.sv ../out/sv/*.vh 2> /dev/null | tr "\n" " ")" >> '$(VIVADO_PROJ_SCRIPT)'
 	vivado -mode batch -nojournal -nolog -notrace -source '$(VIVADO_PROJ_SCRIPT)' '$(DEST_DIR)/$(KERNEL_NAME)_ex/$(KERNEL_NAME)_ex.xpr'
 	@# Replace the adder example code with the user's kernel (including inner shell logic).
 	$(FRAMEWORK_DIR)/fpga/scripts/hack_vadd_example.pl $(KERNEL_NAME) < $(VADD_SV) > $(VADD_SV).hacked

init

@@ -21,13 +21,13 @@ git submodule update --init --recursive
 echo "Installing linux packages."
 mkdir -p local
 COMMON_PACKAGES='make inotify-tools bc remmina jq perl'  # python-tornado removed -- redundant w/ pip install of tornado
-if [[ -n "$(which apt-get)" ]]
+if [[ -n "$(which apt-get 2> /dev/null)" ]]
 then
   # Ubuntu
   sudo apt-get update
   sudo apt-get -y install g++ python3 python3-pip python3-pil $COMMON_PACKAGES
   #sudo python3 -m pip install Pillow
-elif [[ -n "$(which yum)" ]]
+elif [[ -n "$(which yum 2> /dev/null)" ]]
 then
   # CentOS