[VOL-5321] - Add repo:onf-make as a git submodule.
Makefile
lf/transition.mk
----------------
o Add bridge logic to conditionally load legacy makefiles or repo:onf-make.
o transition.mk allows logic to gradually be replaced.
o makefiles/ directory can eventually be removed after all
dependencies on local makefile logic have been removed.
makefiles/
----------
o Replace make var(s) ONF_MAKEDIR= and ONF_MAKE= with var legacy-mk=.
makefiles/commands/include.mk
makefiles/commands/kail/godownloader.sh
---------------------------------------
o Replace loading legacy kail logic with library makefiles.
o Git submodule scripts contain linting cleanup for scripts.
Signed-off-by: Joey Armstrong <jarmstrong@linuxfoundation.org>
Change-Id: I152251039fc3b330ed1a6729922e465c53d00879
diff --git a/Makefile b/Makefile
index 1e52fea..490f957 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,18 @@
##--------------------##
##---] INCLUDES [---##
##--------------------##
-include config.mk
-include makefiles/include.mk
+$(if $(findstring disabled-joey,$(USER)),\
+ $(eval USE_LF_MK := 1)) # special snowflake
+
+##--------------------##
+##---] INCLUDES [---##
+##--------------------##
+ifdef USE_LF_MK
+ $(error should not be here)
+ include lf/include.mk
+else
+ include lf/transition.mk
+endif # ifdef USE_LF_MK
# Variables
VERSION ?= $(shell cat ./VERSION)
@@ -170,14 +180,14 @@
$(if $(LOCAL_FIX_PERMS),touch "$(go-result-out)")
$(if $(LOCAL_FIX_PERMS),chmod o+w "$(go-result-out)")
- # ------------------------------------------
+ # ------------------------------------------
# set -euo pipefail else tee masks $? return
# ------------------------------------------
@echo '** Running test coverage: exit-on-error is currently disabled'
-(\
set -euo pipefail; \
$(GO) test -mod=vendor -v -coverprofile "$(go-cover-out)" -covermode count ./... 2>&1 | tee "$(go-result-out)" \
- )
+ )
$(if $(LOCAL_FIX_PERMS),chmod o-w "$(go-result-out)")
$(if $(LOCAL_FIX_PERMS),chmod o-w "$(go-cover-out)")
@@ -255,4 +265,3 @@
@echo ' gen-coverage-cobertura Generate cobertura report'
# [EOF]
-