Fix centos build and build documentation

Change-Id: I326204d26b613254e39c6a0ffe9f9491981ba3c3
Signed-off-by: jdenisco <jdenisco@cisco.com>

diff --git a/Makefile b/Makefile
index f84636d..432922d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@ RPM_DEPENDS += boost boost-devel
 RPM_DEPENDS += selinux-policy selinux-policy-devel
 RPM_DEPENDS += ninja-build
 RPM_DEPENDS += libuuid-devel
+RPM_DEPENDS += mbedtls-devel
 
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += dnf-utils
@@ -93,7 +94,6 @@ ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += compat-openssl10-devel
        RPM_DEPENDS += python2-devel python34-ply
        RPM_DEPENDS += python2-virtualenv
-       RPM_DEPENDS += mbedtls-devel
        RPM_DEPENDS += cmake
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else

diff --git a/docs/about.rst b/docs/about.rst
index 272df49..b6a5918 100644 (file)
--- a/docs/about.rst
+++ b/docs/about.rst
@@ -4,6 +4,6 @@
 About
 =====
 
-**VPP Version:** 19.04-rc0~219-g7d139ad
+**VPP Version:** 19.04-rc0~276-g3bce8eb
 
-**Built on:** Wed Feb 20 16:18:46 GMT 2019
+**Built on:** Tue Feb 26 14:00:03 GMT 2019

diff --git a/docs/gettingstarted/installing/centos.rst b/docs/gettingstarted/installing/centos.rst
index d498007..88691a2 100644 (file)
--- a/docs/gettingstarted/installing/centos.rst
+++ b/docs/gettingstarted/installing/centos.rst
@@ -143,7 +143,7 @@ needed:
 
 .. code-block:: console
 
-   $ sudo yum install vpp-plugins vpp-ext-deps vpp-devel vpp-api-python vpp-api-lua vpp-api-java vpp-debuginfo vpp-devel libvpp0
+   $ sudo yum install vpp-plugins vpp-devel vpp-api-python vpp-api-lua vpp-api-java vpp-debuginfo vpp-devel libvpp0
 
 Starting VPP
 ============

diff --git a/docs/gettingstarted/installing/ubuntu.rst b/docs/gettingstarted/installing/ubuntu.rst
index c8a9893..65fd5e2 100644 (file)
--- a/docs/gettingstarted/installing/ubuntu.rst
+++ b/docs/gettingstarted/installing/ubuntu.rst
@@ -87,7 +87,7 @@ For the master packages:
 
 .. code-block:: console
 
-  sudo apt-get install vpp-plugin-core vpp-ext-deps vpp-api-python vpp-dbg vpp-dev vpp-plugin-dpdk
+  sudo apt-get install vpp-plugin-core vpp-api-python vpp-dbg vpp-dev vpp-plugin-dpdk
 
 Uninstall the Packages
 ======================

diff --git a/extras/vpp_config/vpplib/VPPUtil.py b/extras/vpp_config/vpplib/VPPUtil.py
index d635485..2cbaa2d 100644 (file)
--- a/extras/vpp_config/vpplib/VPPUtil.py
+++ b/extras/vpp_config/vpplib/VPPUtil.py
@@ -24,12 +24,12 @@ from collections import Counter
 
 ubuntu_pkgs = {'release': ['vpp', 'vpp-plugins', 'vpp-api-java', 'vpp-api-lua', 'vpp-api-python',
                            'vpp-dbg', 'vpp-dev'],
-               'master': ['vpp', 'vpp-plugin-core', 'vpp-ext-deps', 'vpp-api-python',
+               'master': ['vpp', 'vpp-plugin-core', 'vpp-api-python',
                           'vpp-dbg', 'vpp-dev', 'vpp-plugin-dpdk']}
 
 centos_pkgs = {'release': ['vpp', 'vpp-plugins', 'vpp-api-java', 'vpp-api-lua',
                            'vpp-api-python', 'vpp-debuginfo', 'vpp-devel', 'libvpp0'],
-               'master': ['vpp', 'vpp-plugins', 'vpp-ext-deps', 'vpp-api-java', 'vpp-api-lua',
+               'master': ['vpp', 'vpp-plugins', 'vpp-api-java', 'vpp-api-lua',
                           'vpp-api-python', 'vpp-debuginfo', 'vpp-devel', 'libvpp0']}