From 2cefb064045727a50e7e57cc00919389ce8d86ce Mon Sep 17 00:00:00 2001 From: jdenisco Date: Tue, 19 Feb 2019 16:25:05 -0500 Subject: Add support for 19.01 Change-Id: I8583f6f6432d8d7c449f43d62d8707a1718f3240 Signed-off-by: jdenisco --- docs/about.rst | 4 +-- docs/gettingstarted/installing/centos.rst | 52 +------------------------------ docs/gettingstarted/installing/ubuntu.rst | 33 +++++++------------- 3 files changed, 15 insertions(+), 74 deletions(-) (limited to 'docs') diff --git a/docs/about.rst b/docs/about.rst index 76e83d5ca9c..272df4979a5 100644 --- a/docs/about.rst +++ b/docs/about.rst @@ -4,6 +4,6 @@ About ===== -**VPP Version:** 19.04-rc0~102-g22c0ece +**VPP Version:** 19.04-rc0~219-g7d139ad -**Built on:** Wed Jan 30 15:37:57 GMT 2019 +**Built on:** Wed Feb 20 16:18:46 GMT 2019 diff --git a/docs/gettingstarted/installing/centos.rst b/docs/gettingstarted/installing/centos.rst index 133d3093464..d4980070b4f 100644 --- a/docs/gettingstarted/installing/centos.rst +++ b/docs/gettingstarted/installing/centos.rst @@ -72,56 +72,6 @@ provided. $ sudo yum --showduplicates list vpp* | expand -VPP Stable Branch -""""""""""""""""""" - -To allow *yum* access to the build artifacts for a VPP stable branch, create -the file *'/etc/yum.repos.d/fdio-release.repo'* with the following content. - -.. code-block:: console - - $ cat /etc/yum.repos.d/fdio-release.repo - [fdio_1810] - name=fdio_1810 - baseurl=https://packagecloud.io/fdio/1810/el/7/$basearch - repo_gpgcheck=1 - gpgcheck=0 - enabled=1 - gpgkey=https://packagecloud.io/fdio/1810/gpgkey - sslverify=1 - sslcacert=/etc/pki/tls/certs/ca-bundle.crt - metadata_expire=300 - - [fdio_1810-source] - name=fdio_1810-source - baseurl=https://packagecloud.io/fdio/1810/el/7/SRPMS - repo_gpgcheck=1 - gpgcheck=0 - enabled=1 - gpgkey=https://packagecloud.io/fdio/1810/gpgkey - sslverify=1 - sslcacert=/etc/pki/tls/certs/ca-bundle.crt - metadata_expire=300 - -For other stable branches, replace the *'1810'* from the above content with the -desired release. Examples: 1606, 1609, 1701, 1704, 1707, 1710, 1804, 1807 - -Update your local yum cache. - -.. code-block:: console - - $ sudo yum clean all - $ sudo yum -q makecache -y --disablerepo='*' --enablerepo='fdio_1810' - -The *'yum install vpp'* command will install the most recent build on the -branch, not the latest offical release. Run the following command to get the -list of images produce by the branch: - -.. code-block:: console - - $ sudo yum --showduplicates list vpp* | expand - - VPP Master Branch """"""""""""""""""" @@ -193,7 +143,7 @@ needed: .. code-block:: console - $ sudo yum install vpp-plugins vpp-devel vpp-api-python vpp-api-lua + $ sudo yum install vpp-plugins vpp-ext-deps 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 32050334f5b..c8a98939e62 100644 --- a/docs/gettingstarted/installing/ubuntu.rst +++ b/docs/gettingstarted/installing/ubuntu.rst @@ -2,7 +2,7 @@ .. toctree:: -Ubuntu 16.04 - Setup the FD.io Repository +Ubuntu 18.04 - Setup the FD.io Repository ========================================== FD.io VPP is installed using Package Cloud. For a complete set of @@ -37,7 +37,7 @@ Create the file **/etc/apt/sources.list.d/99fd.io.list** that contain the follow .. code-block:: console - deb [trusted=yes] https://packagecloud.io/fdio/release/ubuntu xenial main ./ + deb [trusted=yes] https://packagecloud.io/fdio/release/ubuntu xenial main Get the key: @@ -45,22 +45,6 @@ Get the key: curl -L https://packagecloud.io/fdio/release/gpgkey | sudo apt-key add - -VPP 1810 Branch -^^^^^^^^^^^^^^^^ - -Create the file **/etc/apt/sources.list.d/99fd.io.list** that contain the following contents: - -.. code-block:: console - - deb [trusted=yes] https://packagecloud.io/fdio/1810/ubuntu xenial main ./ - -Get the key: - -.. code-block:: console - - curl -L https://packagecloud.io/fdio/1810/gpgkey | sudo apt-key add - - - VPP master Branch ^^^^^^^^^^^^^^^^^^^^ @@ -68,7 +52,7 @@ Create the file **/etc/apt/sources.list.d/99fd.io.list** that contain the follow .. code-block:: console - deb [trusted=yes] https://packagecloud.io/fdio/master/ubuntu xenial main ./ + deb [trusted=yes] https://packagecloud.io/fdio/master/ubuntu xenial main Get the key: @@ -85,7 +69,7 @@ Install the mandatory packages by running the following commands: .. code-block:: console sudo apt-get update - sudo apt-get install vpp-lib vpp vpp-plugins + sudo apt-get install vpp Install the Optional Packages @@ -93,10 +77,17 @@ Install the Optional Packages Install the optional packages by running the following command: +For the release packages: + .. code-block:: console - sudo apt-get install vpp-dbg vpp-dev vpp-api-python vpp-api-lua + sudo apt-get install vpp-plugins vpp-api-java vpp-api-lua vpp-api-python vpp-dbg vpp-dev + +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 Uninstall the Packages ====================== -- cgit 1.2.3-korg