Revert "VOL-5358 - Build & test on the new AMI..."
This reverts the following commits:
81cca1eb38b4bbb33bf62adc654730ea9e83aed4
9a57710f6ae5903009cfdd85ebdf4df970027679
88270dfbb0d92977f4078653de39961a91bdf01b
19dad067f45cfe2909fd95f5989817be565b40b1
66bb4c49db59481a861b85761054344791d7bec0
9e03368227d45ffe095d4be6b9164080e8fb952c
c8d7063ffeec94a4d20a236cbea83fb8b423cce6
These commits were made while troubleshooting build issues. However,
with the original build machine working now, it seems these changes
have caused several issues. Though they may not all be bad changes,
this amount of reversion is necessary to get back to a place where CI
tests work correctly.
Change-Id: I9248204c8f87203561643acded31cd26a96fb42c
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
diff --git a/Makefile b/Makefile
index fa6ca53..5cbd2b9 100755
--- a/Makefile
+++ b/Makefile
@@ -15,28 +15,16 @@
# limitations under the License.
# -----------------------------------------------------------------------
-$(if $(DEBUG),$(warning ENTER))
-
.PHONY: test
-.DEFAULT_GOAL := test
-MAKECMDGOALS ?= test
+.DEFAULT_GOAL := test
##-------------------##
##---] GLOBALS [---##
##-------------------##
-$(if $(findstring joey,$(USER)),\
- $(eval USE_LF_MK := 1)) # special snowflake
+TOP ?= .
+MAKEDIR ?= $(TOP)/makefiles
-##--------------------##
-##---] INCLUDES [---##
-##--------------------##
-ifdef USE_LF_MK
- include lf/include.mk
-else
- include lf/transition.mk
- include $(legacy-mk)/include.mk
-endif # ifdef USE_LF_MK
-
+$(if $(VERBOSE),$(eval export VERBOSE=$(VERBOSE))) # visible to include(s)
##--------------------------
## Enable setup.py debugging
@@ -45,6 +33,18 @@
# export DISTUTILS_DEBUG := 1 # verbose: pip
export DOCKER_DEBUG := 1 # verbose: docker
+# Makefile for voltha-protos
+default: test
+
+## Library linting
+# NO-LINT-MAKEFILE := true # cleanup needed
+NO-LINT-SHELL := true # cleanup needed
+
+##--------------------##
+##---] INCLUDES [---##
+##--------------------##
+include $(MAKEDIR)/include.mk
+
# Function to extract the last path component from go_package line in .proto files
define go_package_path
$(shell grep go_package $(1) | sed -n 's/.*\/\(.*\)";/\1/p')
@@ -73,14 +73,7 @@
PROTO_JAVA_DEST_DIR := java
PROTO_JAVA_PB := $(foreach f, $(PROTO_FILES), $(patsubst protos/voltha_protos/%.proto,$(PROTO_JAVA_DEST_DIR)/$(call java_package_path,$(f))/%.pb.java,$(f)))
-# -----------------------------------------------------------------------
-# Force pb file to be regenerated every time. Otherwise the make process
-# assumes generated version is still valid.
-# -----------------------------------------------------------------------
-# [TODO]
-# - Revisit: fix target to be dependency driven.
-# - When source not modified make "voltha.pb" behavior always a NOP
-# -----------------------------------------------------------------------
+# Force pb file to be regenrated every time. Otherwise the make process assumes generated version is still valid
.PHONY: voltha.pb
##----------------##
@@ -234,12 +227,9 @@
$(call banner-leave,target $@)
## -----------------------------------------------------------------------
-## Intent: Regenerate voltha.pb
+## Intent:
## ----------------------------------------------------------------------
-voltha-pb += show-proto-files
-voltha-pb += docker-debug-joey
-
-voltha.pb: $(voltha-pb)
+voltha.pb: show-proto-files
$(call banner-enter,target $@)
${PROTOC} \
@@ -340,17 +330,4 @@
@echo -e "PROTO_FILES:\n$(PROTO_FILES)" | tr ' ' '\n'
$(call banner-leave,Target $@)
-## -----------------------------------------------------------------------
-## Intent: Debug mode
-## - New image not logging ssh connections while job is running (?!?)
-## - We should be on label=voltha-1804-micro.
-## - Let(s) see what the reality is while checking configs.
-## -----------------------------------------------------------------------
-.PHONY: docker-debug-joey
-docker-debug-joey:
-
- $(call banner-enter,Target $@)
- ip --brief addr
- $(call banner-leave,Target $@)
-
# [EOF]