[201811][monit] address build issue: hard code ARCH to amd64 (#3982)

* [201811][monit] address build issue: hard code ARCH to amd64

- also hard code the debian package path as in 201811 branch.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

files/build_templates/sonic_debian_extension.j2

@@ -138,7 +138,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT pam-auth-update --remove tacplus
 sudo sed -i -e '/^passwd/s/ tacplus//' $FILESYSTEM_ROOT/etc/nsswitch.conf
 
 # Install custom-built monit package and SONiC configuration files
-sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/monit_*.deb || \
+sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/monit_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 sudo cp $IMAGE_CONFIGS/monit/monitrc $FILESYSTEM_ROOT/etc/monit/
 sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc

rules/monit.mk

@@ -4,11 +4,11 @@ MONIT_VERSION = 5.20.0-6
 
 export MONIT_VERSION
 
-MONIT = monit_$(MONIT_VERSION)_$(CONFIGURED_ARCH).deb
+MONIT = monit_$(MONIT_VERSION)_amd64.deb
 $(MONIT)_SRC_PATH = $(SRC_PATH)/monit
 SONIC_MAKE_DEBS += $(MONIT)
 
 SONIC_STRETCH_DEBS += $(MONIT)
 
-MONIT_DBG = monit-dbgsym_$(MONIT_VERSION)_$(CONFIGURED_ARCH).deb
+MONIT_DBG = monit-dbgsym_$(MONIT_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(MONIT),$(MONIT_DBG)))

src/monit/Makefile

@@ -2,8 +2,8 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
-MAIN_TARGET = monit_$(MONIT_VERSION)_$(CONFIGURED_ARCH).deb
-DERIVED_TARGETS = monit-dbgsym_$(MONIT_VERSION)_$(CONFIGURED_ARCH).deb
+MAIN_TARGET = monit_$(MONIT_VERSION)_amd64.deb
+DERIVED_TARGETS = monit-dbgsym_$(MONIT_VERSION)_amd64.deb
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Remove any stale files