Merge "VOL-765 Modification of ONU indication to have admin state ONU oper state change, ONU indication and ONU dying-gasp changes to reflect operation state and admin state of ONU and pass it on to Voltha"
diff --git a/Makefile b/Makefile
index 2bb460d..770f9a3 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,8 @@
endif
prereq:
- sudo apt-get -q -y install git pkg-config build-essential autoconf libtool libgflags-dev libgtest-dev clang libc++-dev
+ sudo apt-get -q -y install git pkg-config build-essential autoconf libtool libgflags-dev libgtest-dev clang libc++-dev unzip docker.io
+ sudo apt-get install -y build-essential autoconf libssl-dev gawk debhelper dh-systemd init-system-helpers
# Install GRPC plugins
rm -rf $(GRPC_DST)
@@ -165,7 +166,7 @@
KERNDIR=$(ONL_KERNDIR)/linux-$(ONL_KERN_VER) BOARD=$(DEVICE) ARCH=x86_64 SDKBUILD=build_bcm_user make -C $(BCM_SDK)/build-$(DEVICE)/sdk-all-$(SDK_VER)/systems/linux/user/x86-generic_64-2_6
make -C $(BAL_DIR)/bal_release BOARD=$(DEVICE) bal
make -C $(BAL_DIR)/bal_release BOARD=$(DEVICE) release_board
- ln -s -f $(PWD)/$(BAL_DIR)/bcm68620_release/asfvolt16/release/release_$(DEVICE)_V$(BAL_MAJOR_VER).$(ACCTON_VER).tar.gz .
+ ln -s -f $(PWD)/$(BAL_DIR)/bcm68620_release/asfvolt16/release/release_$(DEVICE)_V$(BAL_MAJOR_VER).$(ACCTON_VER).tar.gz .
ln -s -f $(PWD)/$(BAL_DIR)/bal_release/build/core/lib/libbal_api_dist.so .
ln -s -f $(PWD)/$(BAL_DIR)/bal_release/build/core/src/apps/bal_core_dist/bal_core_dist
mv -f release_$(DEVICE)_V$(BAL_MAJOR_VER).$(ACCTON_VER).tar.gz $(BUILD_DIR)
diff --git a/protos/Makefile b/protos/Makefile
index ba9591f..046ca49 100644
--- a/protos/Makefile
+++ b/protos/Makefile
@@ -40,7 +40,7 @@
googleapis:
if [ ! -e "googleapis" ]; then \
- git clone git@github.com:googleapis/googleapis.git; \
+ git clone https://github.com/googleapis/googleapis.git; \
make -C googleapis LANGUAGE=cpp all; \
fi;