[VOL-5308] - bbsim test failure
Makefile
--------
o Temporary flag USE_LF_MK=1 added to enable library repo:onf-make use.
o Default behavior will use legacy makefiles from repo:bbsim/makefiles/.
o Fixed typo on line 76
lf/include.mk
makefiles/
-------------
o Transition bridge for using repo:onf-make.
o Define variable legacy-mk= as bbsim/makefiles/
o Replace path variable $(MAKEDIR=) with $(legacy-mk).
o Replace variable $(ONF_MAKEDIR=) with $(legacy-mk).
o These edits help break dependency on non-library makefiles/ directory.
allowing repo:onf-make to be used as a transparent replacement.
Change-Id: Ida8c020384cf78ddf19fa6375702429d992d10a1
Signed-off-by: Joey Armstrong <jarmstrong@linuxfoundation.org>
diff --git a/makefiles/lint/license/include.mk b/makefiles/lint/license/include.mk
index b9cd06e..96e62a5 100644
--- a/makefiles/lint/license/include.mk
+++ b/makefiles/lint/license/include.mk
@@ -22,8 +22,8 @@
$(if $(DEBUG),$(warning ENTER))
$(if $(USE_LINT_LICENSE)\
- ,$(eval include $(ONF_MAKEDIR)/lint/license/voltha-system-tests/include.mk)\
- ,$(eval include $(ONF_MAKEDIR)/lint/license/common.mk)\
+ ,$(eval include $(legacy-mk)/lint/license/voltha-system-tests/include.mk)\
+ ,$(eval include $(legacy-mk)/lint/license/common.mk)\
)
mk-include--onf-lint-license := true
diff --git a/makefiles/lint/license/voltha-system-tests/include.mk b/makefiles/lint/license/voltha-system-tests/include.mk
index ade7c0a..fa6c83a 100644
--- a/makefiles/lint/license/voltha-system-tests/include.mk
+++ b/makefiles/lint/license/voltha-system-tests/include.mk
@@ -69,7 +69,7 @@
## Jenkins job checking logic.
## -----------------------------------------------------------------------
lint-license:
- $(MAKEDIR)/lint/license/license-check.sh
+ $(legacy-mk)/lint/license/license-check.sh
## -----------------------------------------------------------------------
## -----------------------------------------------------------------------