matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* [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>
This commit is contained in:
Ying Xie 2020-01-07 07:41:40 -08:00 committed by GitHub
parent 640023ec57
commit 5ea7372dbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/build_templates/sonic_debian_extension.j2
View File

@ -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 sudo sed -i -e '/^passwd/s/ tacplus//' $FILESYSTEM_ROOT/etc/nsswitch.conf
# Install custom-built monit package and SONiC configuration files # 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 LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
sudo cp $IMAGE_CONFIGS/monit/monitrc $FILESYSTEM_ROOT/etc/monit/ sudo cp $IMAGE_CONFIGS/monit/monitrc $FILESYSTEM_ROOT/etc/monit/
sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc

4
rules/monit.mk
View File

@ -4,11 +4,11 @@ MONIT_VERSION = 5.20.0-6
export MONIT_VERSION export MONIT_VERSION
MONIT = monit_$(MONIT_VERSION)_$(CONFIGURED_ARCH).deb MONIT = monit_$(MONIT_VERSION)_amd64.deb
$(MONIT)_SRC_PATH = $(SRC_PATH)/monit $(MONIT)_SRC_PATH = $(SRC_PATH)/monit
SONIC_MAKE_DEBS += $(MONIT) SONIC_MAKE_DEBS += $(MONIT)
SONIC_STRETCH_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))) $(eval $(call add_derived_package,$(MONIT),$(MONIT_DBG)))

4
src/monit/Makefile
View File

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