Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yxieca merged 3 commits into from
Jan 7, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5aa176c
[201811][monit] address build issue: hard code ARCH to amd64
yxieca Jan 6, 2020
cfa0c68
hard code arch
yxieca Jan 6, 2020
d97e02c
hardcode path
yxieca Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions rules/monit.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
4 changes: 2 additions & 2 deletions src/monit/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down