Merge pull request #212 from antmicro/conda-pack-preparations

Use Renode from Conda

scripts/build-linux.sh

@@ -44,7 +44,7 @@ if [ "$FIRMWARE" != "linux" ]; then
 fi
 
 # Install a baremetal toolchain with the newlib standard library
-if ! ${CPU_ARCH}-elf-newlib --version > /dev/null 2>&1; then
+if ! ${CPU_ARCH}-elf-newlib-gcc --version > /dev/null 2>&1; then
 	conda install gcc-${CPU_ARCH}-elf-newlib
 fi
 # Install a Linux userspace toolchain with the musl standard library

scripts/build-renode.sh

@@ -26,24 +26,7 @@ fi
 
 if ! $RENODE_FOUND; then
 	# Download prebuilt renode Release if none is currently installed
-
-	RENODE_PACKAGE=renode-latest.linux-portable.tar.gz
-	RENODE_URL=https://antmicro.com/projects/renode/builds/$RENODE_PACKAGE
-	RENODE_LOCATION="$BUILD_DIR/renode"
-	mkdir -p $RENODE_LOCATION
-
-	RENODE_BIN=`find $RENODE_LOCATION -executable -type f -name renode`
-	if [ ! -x "$RENODE_BIN" ]; then
-		(
-			cd $RENODE_LOCATION
-			wget $RENODE_URL
-			tar -xf $RENODE_PACKAGE
-		)
-
-		RENODE_BIN=`find $RENODE_LOCATION -executable -type f -name renode`
-		chmod u+x $RENODE_BIN
-		echo "Renode downloaded and installed locally: $RENODE_BIN"
-	fi
+	conda install -c antmicro -c conda-forge renode
 fi
 
 case $CPU in

scripts/download-env.sh

@@ -74,6 +74,10 @@ set -e
 
 . $SETUP_DIR/settings.sh
 
+# If we activate an environment, CONDA_PREFIX is set. Otherwise use CONDA_DIR.
+export CONDA_PREFIX="${CONDA_PREFIX:-$CONDA_DIR}"
+export CONDA_DIR=$CONDA_PREFIX
+
 echo "             This script is: $SETUP_SRC"
 echo "         Firmware directory: $TOP_DIR"
 echo "         Build directory is: $BUILD_DIR"

scripts/enter-env.sh

@@ -74,6 +74,10 @@ fi
 
 . $SETUP_DIR/settings.sh
 
+# If we activate an environment, CONDA_PREFIX is set. Otherwise use CONDA_DIR.
+export CONDA_PREFIX="${CONDA_PREFIX:-$CONDA_DIR}"
+export CONDA_DIR=$CONDA_PREFIX
+
 echo "             This script is: $SETUP_SRC"
 echo "         Firmware directory: $TOP_DIR"
 echo "         Build directory is: $BUILD_DIR"