From 9f545456c9cfa2cec188dc8f10d458a37b866bd4 Mon Sep 17 00:00:00 2001 From: cawand <39776867+cawand@users.noreply.github.com> Date: Wed, 15 Aug 2018 21:41:12 -0700 Subject: [PATCH] Added picocom and pexpect to base image, for use in consutil (#1935) Signed-off-by: Cayla Wanderman-Milne --- build_debian.sh | 3 ++- files/build_templates/sonic_debian_extension.j2 | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build_debian.sh b/build_debian.sh index fc8a2cb59b..ebe32ca536 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -227,7 +227,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in hping3 \ python-scapy \ tcptraceroute \ - mtr-tiny + mtr-tiny \ + picocom sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \ grub-pc-bin diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2 index 62637446dd..b43e616e17 100644 --- a/files/build_templates/sonic_debian_extension.j2 +++ b/files/build_templates/sonic_debian_extension.j2 @@ -98,6 +98,10 @@ sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY2_WHEEL_NAME sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/python-click*_all.deb || \ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f +# Install python pexpect used by sonic-utilities consutil +# using pip install instead to get a more recent version than is available through debian +sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install pexpect + # Install SONiC Utilities (and its dependencies via 'apt-get -y install -f') sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/python-sonic-utilities_*.deb || \ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f