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

add more marshal deps. These got dropped somehow

This commit is contained in:
Tim Snyder 2022-03-19 20:58:30 +00:00
parent 0b9f1ab618
commit 2f9a58ed84
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-setup-nolog.sh
View File

@ -185,6 +185,10 @@ if [ "$SKIP_TOOLCHAIN" != true ]; then
. "${devtoolset}/enable"
fi
# chipyards build-toolchains.sh make defaults to gnumake or gmake but we
# have latest make installed as make
export MAKE=make
# Build the toolchain through chipyard (whether as top or as library)
cd "$target_chipyard_dir"
if [ "$FASTINSTALL" = "true" ] ; then
@ -209,6 +213,8 @@ if wget -T 1 -t 3 -O /dev/null http://169.254.169.254/; then
# Install firesim-software dependencies
# We always setup the symlink correctly above, so use sw/firesim-software
marshal_dir=$RDIR/sw/firesim-software
# the only ones missing are libguestfs-tools
sudo yum install -y libguestfs-tools bc
# Setup for using qcow2 images
# XXX skip this for now because it needs rpmbuild and other things from the Development Tools group

2
scripts/install-nbd-kmod.sh
View File

@ -3,7 +3,7 @@
set -ex
# deps
sudo yum -y install xmlto asciidoc hmaccalc newt-devel pesign elfutils-devel binutils-devel audit-libs-devel numactl-devel pciutils-devel python-docutils "perl(ExtUtils::Embed)"
sudo yum -y install rpm-build xmlto asciidoc hmaccalc newt-devel pesign elfutils-devel binutils-devel audit-libs-devel numactl-devel pciutils-devel python-docutils python-devel "perl(ExtUtils::Embed)" bison java-devel ncurses-devel
# update this as FPGA Dev AMI updates
KSRC='3.10.0-957.5.1.el7'

5
scripts/machine-launch-script.sh
View File

@ -165,12 +165,10 @@ set -o pipefail
# obvi this would need to be made linux-specific if we supported other MacOS or Windows
CONDA_PACKAGE_SPECS+=( "kernel-headers_linux-64>=2.6.38" )
# firemarshal deps
CONDA_PACKAGE_SPECS+=( rsync psutil doit gitpython humanfriendly e2fsprogs )
CONDA_PACKAGE_SPECS+=( rsync psutil doit gitpython humanfriendly e2fsprogs ctags yacc bison flex expat )
# cross-compile glibc 2.28+ deps
CONDA_PACKAGE_SPECS+=( make )
# other misc deps
# conda-forge splits out the shared library into libzlib
# not sure if we need both, but I'm including them for now
CONDA_PACKAGE_SPECS+=(
sbt \
ca-certificates \
@ -179,7 +177,6 @@ set -o pipefail
mpfr \
mpc \
zlib \
libzlib \
vim \
git \
openjdk \