[baseimage]: Download picocom version 3.1-2 from stretch-backports; N…

…o longer build from source (#1946)

build_debian.sh

@@ -229,6 +229,11 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     tcptraceroute           \
     mtr-tiny
 
+# Install certain fundamental packages from stretch-backports in order to get
+# more up-to-date (but potentially less stable) versions
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t stretch-backports install \
+    picocom
+
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
     grub-pc-bin
 
@@ -237,9 +242,6 @@ sudo mv $FILESYSTEM_ROOT/grub-pc-bin*.deb $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-
 sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/libwrap0_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 
-sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/picocom_*.deb || \
-    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
-
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
 

files/apt/sources.list

@@ -5,3 +5,4 @@ deb http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-fr
 deb-src http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free
 deb http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
 deb-src http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
+deb http://debian-archive.trafficmanager.net/debian/ stretch-backports main contrib non-free

files/image_config/apt/sources.list.d/debian_archive_trafficmanager_net_debian.list

@@ -1,2 +1,3 @@
 deb http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free
 deb http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free
+deb http://debian-archive.trafficmanager.net/debian/ stretch-backports main contrib non-free

slave.mk

@@ -462,8 +462,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
                 $(BASH) \
                 $(LIBWRAP) \
                 $(LIBPAM_TACPLUS) \
-                $(LIBNSS_TACPLUS) \
-                $(PICOCOM)) \
+                $(LIBNSS_TACPLUS)) \
         $$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
         $$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_CONFIG_ENGINE)) \
         $$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_PLATFORM_COMMON_PY2))

sonic-slave-stretch/Dockerfile

@@ -6,7 +6,7 @@ RUN echo "deb http://debian-archive.trafficmanager.net/debian/ stretch main cont
         echo "deb-src http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free" >> /etc/apt/sources.list && \
         echo "deb http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
         echo "deb-src http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
-        echo 'deb http://debian-archive.trafficmanager.net/debian stretch-backports main' >> /etc/apt/sources.list
+        echo "deb http://debian-archive.trafficmanager.net/debian stretch-backports main" >> /etc/apt/sources.list
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -201,9 +201,7 @@ RUN apt-get update && apt-get install -y \
 # For pam_tacplus build
         autoconf-archive \
 # For initramfs
-        bash-completion \
-# For picocom
-        pandoc
+        bash-completion
 
 # For linux build
 RUN apt-get -y build-dep linux