Fix bugs and add helpful messages, script is tested and works fully now

diff --git a/coriolis2-chroot b/coriolis2-chroot
index f25bf805c0349a7f637a0c6b16e361b156cbf862..e61d3b4a161e8502e98192f4169427d36d2ed7d2 100755 (executable)
--- a/coriolis2-chroot
+++ b/coriolis2-chroot
@@ -3,6 +3,7 @@ if [ "$EUID" -ne 0 ]
   then echo "Please run as root"
   exit
 fi
+# Setup fstab mount points
 cat <<'EOF' >> /etc/fstab
 /dev      /opt/chroot/coriolis/dev      none   bind   0   0
 /dev/pts  /opt/chroot/coriolis/dev/pts  none   bind   0   0
@@ -10,9 +11,13 @@ cat <<'EOF' >> /etc/fstab
 /sys      /opt/chroot/coriolis/sys      none   bind   0   0
 /tmp      /opt/chroot/coriolis/tmp      none   bind   0   0
 EOF
+# Create coriolis chroot dir in /opt
 mkdir -p /opt/chroot/coriolis
+# Install debootstrap and schroot via apt
 apt install -y debootstrap schroot
+# Install debian/buster chroot using debootstrap
 /usr/sbin/debootstrap buster /opt/chroot/coriolis http://ftp.debian.org/debian
+# Mount all chroot mount points from fstab
 mount /opt/chroot/coriolis/dev
 mount /opt/chroot/coriolis/dev/pts
 mount /opt/chroot/coriolis/proc
@@ -21,6 +26,7 @@ mount /opt/chroot/coriolis/tmp
 echo "coriolis2" > /opt/chroot/coriolis/etc/debian_chroot
 export MYNAME=`id 1000 | awk '{print $1}' | sed 's/.*(\(.*\))/\1/'`
 export CHU_HOME=/home/$MYNAME
+# Install apt dependencies in the chroot
 chroot /opt/chroot/coriolis /bin/bash << EOF
 echo Installing necessary apt dependencies in the chroot
 apt-get update -y
@@ -28,16 +34,16 @@ apt-get upgrade -y
 apt-get install -y automake binutils-dev bison build-essential \
 ccache clang cmake doxygen dvipng flex gcc git graphviz \
 imagemagick libboost-all-dev libboost-python-dev libbz2-dev \
-libmotif-dev libreadline-dev libqwt-dev libtool libx11-dev \
-libxaw7-dev libxml2-dev libxpm-dev libxt-dev python3.7 \
-python3-jinja2 python3-pip python3-setuptools python-dev \
-python-qt4 python-sphinx qt4-dev-tools rapidjson-dev tcl \
-tcl-dev tcl-tclreadline texlive texlive-fonts-extra \
-texlive-lang-french texlive-latex-extra texlive-pictures \
-xfig yosys zlib1g-dev
-
+libmpfr-dev libgmp-dev libmotif-dev libreadline-dev \
+libqwt-dev libtool libx11-dev libxaw7-dev libxml2-dev \
+libxpm-dev libxt-dev python3.7 python3-jinja2 python3-pip \
+python3-setuptools python-dev python-qt4 python-sphinx \
+qt4-dev-tools rapidjson-dev tcl tcl-dev tcl-tclreadline \
+texlive texlive-fonts-extra texlive-lang-french \
+texlive-latex-extra texlive-pictures xfig yosys zlib1g-dev
 
 
+# Create user with same UID in the chroot
 useradd -m -p `python -c 'import crypt; print crypt.crypt("1234","Fx")'` -s /bin/bash $MYNAME -k /etc/skel
 echo -e "
 Added user ${MYNAME} with \e[1;91mpassword: 1234\e[0m"
@@ -46,13 +52,15 @@ echo -e "
 \e[1;91mPlease use command 'passwd ${MYNAME}' to change this immediately after this script is run for security purposes.\e[0m
 "
 
-echo -e 'export PATH=/usr/lib/ccache:"\044PATH"\nexport DISPLAY=:0.0\nexport ALLIANCE_TOP=$CHU_HOME/alliance/install\nexport LD_LIBRARY_PATH=\044{ALLIANCE_TOP}/lib:\044{LD_LIBRARY_PATH}\nexport LD_LIBRARY_PATH=\044{ALLIANCE_TOP}/lib64:\044{LD_LIBRARY_PATH}' > $CHU_HOME/.bash_profile
+# Add convenience variable to chroot user .bash_profile
+echo -e 'export PATH=/usr/lib/ccache:"\044PATH"\nexport DISPLAY=:0.0\nexport ALLIANCE_TOP=$CHU_HOME/alliance/install\nexport YOSYS_TOP=$CHU_HOME/yosys\nexport LD_LIBRARY_PATH=\044{ALLIANCE_TOP}/lib:\044{LD_LIBRARY_PATH}\nexport LD_LIBRARY_PATH=\044{ALLIANCE_TOP}/lib64:\044{LD_LIBRARY_PATH}' > $CHU_HOME/.bash_profile
 chown $MYNAME $CHU_HOME/.bash_profile
 chgrp $MYNAME $CHU_HOME/.bash_profile
 
 echo -e "Added 'export PATH=/usr/lib/ccache:\"\044PATH\"\nexport DISPLAY=:0.0' to $CHU_HOME/.bash_profile to speed up rebuilds"
 EOF
 
+# Add coriolis config to schroot.conf
 cat <<EOF >>/etc/schroot/schroot.conf
 [coriolis]
 description=Debian Buster for Coriolis
@@ -71,6 +79,7 @@ This enables you to chroot into coriolis as an unprivileged user by running
 'schroot -c coriolis /bin/bash'
 "
 
+# Build and install yosys from source
 chroot /opt/chroot/coriolis /bin/bash << EOF
 apt-get update -y 
 apt-get build-dep yosys -y
@@ -83,48 +92,66 @@ cd yosys
 make config-clang
 make -j$(nproc)
 EOF'
+
 chroot /opt/chroot/coriolis /bin/bash << EOF
 cd $CHU_HOME/yosys
 make install
 EOF
 
+# Install coriolis2 from source
 runuser $MYNAME --preserve-environment -c 'schroot -c coriolis /bin/bash << EOF
 cd $CHU_HOME
-mkdir -p $CHU_HOME/alliance/build $CHU_HOME/alliance/install
-cd $CHU_HOME/alliance
+source .bash_profile
+mkdir -p $CHU_HOME/coriolis-2.x/src
+cd $CHU_HOME/coriolis-2.x/src
+git clone https://gitlab.lip6.fr/vlsi-eda/coriolis.git
+cd coriolis
+git checkout devel
+./bootstrap/ccb.py --project=coriolis --make="-j$(nproc) install"
+
+# Setup and test coriolisenv
+$CHU_HOME/coriolis-2.x/src/coriolis/bootstrap/coriolisEnv.py > $CHU_HOME/coriolisenv
+source $CHU_HOME/.bash_profile
+source $CHU_HOME/coriolisenv
+# Popup coriolis2 window to test that it was installed correctly and works
+#cd ~/coriolis-2.x/Linux.x86_64/Release.Shared/install/bin
+#./cgt
+EOF'
+
+# Install alliance from source
+runuser $MYNAME --preserve-environment -c 'schroot -c coriolis /bin/bash <<    EOF
+cd $CHU_HOME
+source coriolisenv
 git clone https://gitlab.lip6.fr/vlsi-eda/alliance.git
-cd alliance/alliance/src
+mkdir -p $CHU_HOME/alliance/build $CHU_HOME/alliance/install
+mv alliance/alliance/src alliance
+rm -rf alliance/alliance
+cd alliance/src
 ./autostuff
 cd $CHU_HOME/alliance/build
-../alliance/alliance/src/configure --prefix=$ALLIANCE_TOP --enable-alc-shared
+../src/configure --prefix=$CHU_HOME/alliance/install --enable-alc-shared
 EOF'
 
 chroot /opt/chroot/coriolis /bin/bash << EOF
 cd $CHU_HOME/alliance/build
+source $CHU_HOME/coriolisenv
 make -j1 install
 EOF
 
-
-echo MYNAME $MYNAME
-echo CHU_HOME $CHU_HOME
-
-
+# Install and configure alliance-check-toolkit
 runuser $MYNAME --preserve-environment -c 'schroot -c coriolis /bin/bash << EOF
 cd $CHU_HOME
-mkdir -p $CHU_HOME/coriolis-2.x/src
-cd $CHU_HOME/coriolis-2.x/src
-git clone https://gitlab.lip6.fr/vlsi-eda/coriolis.git
-cd coriolis
-git checkout devel
-./bootstrap/ccb.py --project=coriolis --make="-j$(nproc) install"
-
-#ln -s $CHU_HOME/coriolis-2.x/Linux.x86_64/Release.Shared/install/lib64 $CHU_HOME/coriolis-2.x/Linux.x86_64/Release.Shared/install/lib
-#./bootstrap/ccb.py --project=coriolis --make="-j$(nproc) install"
-
-$CHU_HOME/coriolis-2.x/src/coriolis/bootstrap/coriolisEnv.py > $CHU_HOME/coriolisenv
+git clone https://gitlab.lip6.fr/vlsi-eda/alliance-check-toolkit.git
+source coriolisenv
+touch alliance-check-toolkit/etc/mk/users.d/user-$MYNAME.mk
+cat <<EOG >>alliance-check-toolkit/etc/mk/users.d/user-$MYNAME.mk
+export CORIOLIS_TOP=/home/$MYNAME/coriolis-2.x/Linux.x86_64/Release.Shared/install
+export ALLIANCE_TOP=/home/$MYNAME/alliance/install
+export CHECK_TOOLKIT=/home/$MYNAME/alliance-check-toolkit
+export YOSYS_TOP=/home/$MYNAME/yosys
+EOG
 source $CHU_HOME/.bash_profile
-source $CHU_HOME/coriolisenv
-cd ~/coriolis-2.x/Linux.x86_64/Release.Shared/install/bin
-./cgt
+cd alliance-check-toolkit/benchs/ARM/cmos
+make lvx
+make cgt
 EOF'
-