Revert changes to use onf-make
onf-make was never compatible with this repo. For now, we want to
revert these changes so that the build can work properly again.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I0afb08030edcae4d2e968c63ef5eb11e17085d8a
diff --git a/Makefile b/Makefile
index 447e858..237c457 100644
--- a/Makefile
+++ b/Makefile
@@ -28,12 +28,7 @@
##--------------------##
##---] INCLUDES [---##
##--------------------##
-ifdef USE_LF_MK
- include lf/include.mk
-else
- venv-name ?= .venv
- include lf/transition.mk
-endif # ifdef USE_LF_MK
+include makefiles/include.mk
# You can set these variables from the command line.
SPHINXOPTS ?=
@@ -280,16 +275,8 @@
'Display WARNING strings buried in sphinx output'
## -----------------------------------------------------------------------
-## Intent: Checkout external repository dependencies
-## -----------------------------------------------------------------------
-init :: git-submodules
-
-git-submodules:
- git submodule update --init --recursive
-
-## -----------------------------------------------------------------------
## Intent: Display make help footer
## -----------------------------------------------------------------------
-include $(ONF_MAKEDIR)/help/trailer.mk
+include makefiles-orig/help/trailer.mk
# [EOF]
diff --git a/VERSION b/VERSION
index 965a689..14239ef 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.13.4
+2.13.6
diff --git a/conf.py b/conf.py
index 13415f7..009f01c 100644
--- a/conf.py
+++ b/conf.py
@@ -60,7 +60,7 @@
project = "VOLTHA Docs"
copyright = (
- "Copyright 2019-2024 Open Networking Foundation Contributors"
+ "Copyright 2019-2025 Open Networking Foundation Contributors"
)
author = "VOLTHA Contributors"
@@ -147,7 +147,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = None
diff --git a/makefiles-orig/include.mk b/makefiles-orig/include.mk
index c400f4b..7b983c1 100644
--- a/makefiles-orig/include.mk
+++ b/makefiles-orig/include.mk
@@ -41,7 +41,7 @@
include $(ONF_MAKEDIR)/etc/include.mk # banner macros
include $(ONF_MAKEDIR)/commands/include.mk # Tools and local installers
-# include $(ONF_MAKEDIR)/virtualenv.mk# # lint-{jjb,python} depends on venv
+include $(ONF_MAKEDIR)/virtualenv.mk# # lint-{jjb,python} depends on venv
include $(ONF_MAKEDIR)/patches/include.mk# # Patch when python 3.10+ in use
include $(ONF_MAKEDIR)/lint/include.mk
diff --git a/makefiles/include.mk b/makefiles/include.mk
index 4360b73..44872b4 100644
--- a/makefiles/include.mk
+++ b/makefiles/include.mk
@@ -60,7 +60,7 @@
## 1) Library constants and logic loaded first
## 2) Parameterize and augment targets from local (repo specific)
## -----------------------------------------------------------------------
-include $(lf-sbx-root)/lf/config.mk # include $(onf-mk-top)/makefiles/config.mk
+include $(onf-mk-top)/makefiles/config.mk
include $(onf-mk-lib)/include.mk
include $(onf-mk-loc)/include.mk
diff --git a/requirements.txt b/requirements.txt
index 5838cbc..84806ce 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,7 +23,8 @@
recommonmark~=0.7.1
doc8~=1.1.2
docutils~=0.21.2
-sphinx-multiversion~=0.2.4
+#sphinx-multiversion~=0.2.4
+git+https://github.com/eb-oss/sphinx-multiversion@test
sphinx-reload~=0.2.0
sphinx-rtd-theme~=3.0.2
sphinxcontrib-openapi~=0.8.4