commit 30bfd39e43fae431b6923a8b9ca270665b667315
author Joey Armstrong <jarmstrong@linuxfoundation.org> Wed Apr 10 16:10:06 2024 -0400
committer Eric Ball <eball@linuxfoundation.org> Thu Oct 03 16:47:27 2024 -0700
tree 5b96decd994c3480aa5eb066bed1c210817e8aa6
parent 2ff3a76122b937bc256a7ee6fc2a7ba81f709c5d

[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>

makefiles/include.mk

diff --git a/makefiles/include.mk b/makefiles/include.mk
index 4cd3055..247df88 100644
--- a/makefiles/include.mk
+++ b/makefiles/include.mk
@@ -26,38 +26,35 @@
 ## -----------------------------------------------------------------------
 onf-mk-abs    ?= $(abspath $(lastword $(MAKEFILE_LIST)))
 onf-mk-top    := $(subst /include.mk,$(null),$(onf-mk-abs))
-ONF_MAKEDIR   := $(onf-mk-top)
 
-MAKEDIR ?= $(ONF_MAKEDIR)#                   # Two dirs needed, local and common
+include $(legacy-mk)/consts.mk
+include $(legacy-mk)/help/include.mk       # render target help
+include $(legacy-mk)/utils/include.mk      # dependency-less helper macros
+include $(legacy-mk)/etc/include.mk        # banner macros
 
-include $(ONF_MAKEDIR)/consts.mk
-include $(ONF_MAKEDIR)/help/include.mk       # render target help
-include $(ONF_MAKEDIR)/utils/include.mk      # dependency-less helper macros
-include $(ONF_MAKEDIR)/etc/include.mk        # banner macros
+include $(legacy-mk)/virtualenv.mk#        # lint-{jjb,python} depends on venv
 
-include $(ONF_MAKEDIR)/virtualenv.mk#        # lint-{jjb,python} depends on venv
+include $(legacy-mk)/lint/include.mk
 
-include $(ONF_MAKEDIR)/lint/include.mk
+# include $(legacy-mk)/git-submodules.mk
+# include $(legacy-mk)/gerrit/include.mk
+include $(legacy-mk)/golang/include.mk
 
-# include $(ONF_MAKEDIR)/git-submodules.mk
-# include $(ONF_MAKEDIR)/gerrit/include.mk
-include $(ONF_MAKEDIR)/golang/include.mk
-
-include $(ONF_MAKEDIR)/todo.mk
-include $(ONF_MAKEDIR)/help/variables.mk
+include $(legacy-mk)/todo.mk
+include $(legacy-mk)/help/variables.mk
 
 ##---------------------##
 ##---]  ON_DEMAND  [---##
 ##---------------------##
-$(if $(USE_DOCKER_MK),$(eval $(ONF_MAKEDIR)/docker/include.mk))
+$(if $(USE_DOCKER_MK),$(eval $(legacy-mk)/docker/include.mk))
 
 ##-------------------##
 ##---]  TARGETS  [---##
 ##-------------------##
-include $(ONF_MAKEDIR)/targets/clean.mk
-# include $(ONF_MAKEDIR)/targets/check.mk
-include $(ONF_MAKEDIR)/targets/sterile.mk
-# include $(ONF_MAKEDIR)/targets/test.mk
+include $(legacy-mk)/targets/clean.mk
+# include $(legacy-mk)/targets/check.mk
+include $(legacy-mk)/targets/sterile.mk
+# include $(legacy-mk)/targets/test.mk
 
 $(if $(DEBUG),$(warning LEAVE))