Minor edits to support repo:onf-make
Makefile
--------
o Remove Makefile inlined include help/trailer.mk, lib sourced.
lf/include.mk
-------------
o Mark git-submodule targets as .PHONY so they always process.
o Use library $(banner) macro to annouce target for logging.
o Add help text for two git-submodule targets.
requirements.txt
----------------
o Add bashate to the list of python modules to install.
Change-Id: If35c7aac9e0deb25c0fc0ba8b158aafe78d6754f
diff --git a/Makefile b/Makefile
index a021c41..3f1954e 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,8 @@
# -----------------------------------------------------------------------
# horrible dep: (ie -- .PHONY: $(JOBCONFIG_DIR))
# o Directory inode always changing due to (time-last-accessed++).
-# o Dependent Targets always re-made due to setale dependency.
-# o Use file inside directory as dep rather than a directory.
+# o Dependent Targets always re-made due to stale dependency.
+# o Use one file inside directory as dep rather than dep-on-a-directory.
# -----------------------------------------------------------------------
$(JOBCONFIG_DIR):
mkdir $@
@@ -53,8 +53,6 @@
##-------------------##
##---] TARGETS [---##
##-------------------##
-## Display make help summary late
-include $(ONF_MAKEDIR)/help/trailer.mk
# make help not widely in use yet so be explicit
help ::
diff --git a/lf/include.mk b/lf/include.mk
index 7034ea3..ebaacde 100644
--- a/lf/include.mk
+++ b/lf/include.mk
@@ -61,7 +61,8 @@
## version available from the remote repository. Subsequently
## a checkin will be needed to make the submodule update permanent.
## -----------------------------------------------------------------------
-update-submodules:
+.PHONY: update-git-submodules
+update-git-submodules:
git submodule foreach git pull
## -----------------------------------------------------------------------
@@ -72,12 +73,24 @@
## repo:onf-make submodule, this target/dependency will initialize
## and checkout all submodules the current repository depends on.
## -----------------------------------------------------------------------
+.PHONY: git-submodules
+git-submodules : $(onf-mk-lib)/include.mk
+
$(onf-mk-lib)/include.mk:
- @echo
- @echo "** Checkout git submodule(s)"
- @echo "** -----------------------------------------------------------------------"
+
+ $(call banner-enter,(Checkout git submodules))
+
git submodule update --init --recursive
- @echo "** -----------------------------------------------------------------------"
+
+ $(call banner-leave,(Checkout git submodules))
+
+## -----------------------------------------------------------------------
+## -----------------------------------------------------------------------
+help-git :
+ @printf ' %-33.33s %s\n' 'git-submodules' \
+ 'Init and recursive checkout of git submodule(s)'
+ @printf ' %-33.33s %s\n' 'update-git-submodules' \
+ 'Update git submodule(s) to the latest version'
$(if $(DEBUG),$(warning LEAVE))
diff --git a/lf/onf-make b/lf/onf-make
index 7ebfb1f..62ae139 160000
--- a/lf/onf-make
+++ b/lf/onf-make
@@ -1 +1 @@
-Subproject commit 7ebfb1f38c7461d35bc80ebdb3f8eac6b7e25ac3
+Subproject commit 62ae139e6e69c0422b2d8c4a272301b46bcbc21a
diff --git a/requirements.txt b/requirements.txt
index 23e849d..7b561ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,8 @@
pipdeptree
jenkins-jobs
+bashate
+
# Installed on-demand by makefiles/lint/python/{flake8,pylint,tox}.mk
# pylint
# tox