[VOL-5358] - misc edits needed to support repo:onf-make use.
config.mk
---------
- Simple copyright notice update.
makefiles/commands/include.mk
makefiles/commands/kubectl/include.mk
-------------------------------------y
- Added a central installer for the kubectl command.
- Rename commands 'help::' target to commands-help.
- Default help is growing long in the stream.
makefiles/commands/kail/include.mk
makefiles/commands/pre-commit/
makefiles/commands/tox/tox.mk
----------------------------------
- Update copyright notice
- Changed default help target to target commands-help and define
{command-name}-help for individual targets. Default help target
is beginning to grow long displaying everything.
makefiles/docker/include.mk
---------------------------
- Update include docker config file (directory mount paths) to also load
the config from lf/local/docker/config/include.mk to avoid storing
all custom repo configs in repo:onf-make.
Signed-off-by: Joey Armstrong <jarmstrong@linuxfoundation.org>
Change-Id: I075be7c710bd7308ce258109455cc2ea2a3ae780
diff --git a/makefiles/docker/include.mk b/makefiles/docker/include.mk
index 958cd35..1561782 100644
--- a/makefiles/docker/include.mk
+++ b/makefiles/docker/include.mk
@@ -22,14 +22,24 @@
$(if $(DEBUG),$(warning ENTER))
-# Per-repository
-include $(onf-mk-dir)/docker/config/$(--repo-name--).mk
-
# ------------------- ##
# ---] GLOBALS [--- ##
# ------------------- ##
VOLTHA_TOOLS_VERSION ?= 2.4.0
+# -------------------- ##
+# ---] INCLUDES [--- ##
+# -------------------- ##
+# include $(onf-mk-dir)/docker/help.mk
+
+# -----------------------------------------------------------------------
+# Load per-repository config: docker mount points, etc
+# -----------------------------------------------------------------------
+include $(firstword $(wildcard \
+ $(local-mk-dir)/docker/config/include.mk \
+ $(onf-mk-dir)/docker/config/$(--repo-name--).mk \
+))
+
# ---------------------------------
# Induce error for misconfiguration
# ---------------------------------