summaryrefslogtreecommitdiffstats
path: root/cicn-plugin/scripts/build-package.sh
diff options
context:
space:
mode:
authorJim Gibson <gibson+fdio@cisco.com>2017-06-01 15:30:03 -0400
committerJim Gibson <gibson+fdio@cisco.com>2017-06-02 16:51:22 -0400
commit716eb01c0b25f7b5bd74e91ec3a1c8d51d402c00 (patch)
tree919b6c07dd9a4a9bf6c430e382efed18e9162916 /cicn-plugin/scripts/build-package.sh
parent2c8098d53b946eec9526dbb5cb4086efb6fa3366 (diff)
Update cicn-plugin for vpp v17.04 (from v17.01)Vpp-plugin-v17.04
1. Changes for cicn-plugin to build under v17.04: - update build files to v17.04, including - no longer need/want plugin to include dpdk headers (though still link in dpdk plugin) - vpp include changes - relocation of vpe.api.h - relocation of pneum.h - for modprobe, replace igb_uio with uio_pci_generic - vnet/ip/udp.h => vnet/udp/udp.h - update cicn vpp plugin registration per vpp changes - use new VLIB_PLUGIN_REGISTER() macro - delete no-loger-supported vlib_plugin_register() function, moving contents of latter to cicn_init - remove sm->ethernet_main, which was not used and is no longer part of plugin boilerplate. - cicn_api_test_plugin.so (plugin for vpp_api_test) - update per 17.04 updated requirements: vat_api_hookup => cicn_vat_api_hookup - buffering/cloning changes needed for building - CICN_FEATURE_VPP_VLIB_CLONING hard-coded enabled and removed, - CICN_FEATURE_DPDK_RTEMBUF_CLONING removed - Small indentation updates from vpp checkstyle.sh 2. Updates for new vlib_buffer_attach_clone() API now exported by vpp - remove code to manage rte_mbuf: cicn plugin now longer depends on dpdk being present. - remove use of indirect header for cloned cs entry: new scheme supports having hdr buffer point directly to shared buffer rather that requiring hdr buffer to poitn to indirect header that points to cs buffer - cicn_rte_mbuf_inlines.h replaced by much smaller cicn_infra_inlines.h - report new characteristic of whether cloning replication is enabled - "cicn show internal" (dbg cli), "cicn_api_node_params_get" (vpp_api_test) - update output accordingly - cicn_show: other tweaks to output 3. In node.c, in code for dropping possibly multiple buffers - delete ifdef'd-out code block for dropping using the drop node [this codepath possibly had buffer problems.] - retain code that instead drops by freeing buffers directly. [this codepath has been robust with respect to buffer management] Change-Id: I6e3d18153f52d8b94773332a39cc452873589baf Signed-off-by: Jim Gibson <gibson+fdio@cisco.com>
Diffstat (limited to 'cicn-plugin/scripts/build-package.sh')
-rw-r--r--cicn-plugin/scripts/build-package.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/cicn-plugin/scripts/build-package.sh b/cicn-plugin/scripts/build-package.sh
index 5af305ce..8265300b 100644
--- a/cicn-plugin/scripts/build-package.sh
+++ b/cicn-plugin/scripts/build-package.sh
@@ -9,12 +9,12 @@ apt_get=${APT_PATH:-"/usr/local/bin/apt-get"}
BUILD_TOOLS_UBUNTU="build-essential cmake"
LIBSSL_LIBEVENT_UBUNTU="libevent-dev libssl-dev"
-DEPS_UBUNTU="vpp-dev vpp-dpdk-dev vpp-lib"
+DEPS_UBUNTU="vpp-dev vpp-lib"
BUILD_TOOLS_GROUP_CENTOS="'Development Tools'"
BUILD_TOOLS_SINGLE_CENTOS="cmake"
LIBSSL_LIBEVENT_CENTOS="libevent-devel openssl-devel"
-DEPS_CENTOS="vpp-dev vpp-dpdk-dev vpp-lib"
+DEPS_CENTOS="vpp-devel"
# Parameters:
# $1 = Distribution [Trusty / CentOS]
@@ -81,9 +81,9 @@ update_fdio_repo() {
if [ "$DISTRIB_ID" == "Ubuntu" ]; then
if [ "$DISTRIB_CODENAME" == "xenial" ]; then
- REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.xenial.main/"
+ REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1704.ubuntu.xenial.main/"
elif [ "$DISTRIB_CODENAME" == "trusty" ]; then
- REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.ubuntu.trusty.main/"
+ REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1704.ubuntu.trusty.main/"
else
echo "Distribution $DISTRIB_CODENAME is not supported"
exit -1
@@ -92,7 +92,7 @@ update_fdio_repo() {
echo "deb ${REPO_VPP_URL} ./" | sudo tee /etc/apt/sources.list.d/99fd.io.list
elif [ "$DISTRIB_ID" == "CentOS" ]; then
- REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1701.centos7/"
+ REPO_VPP_URL="${NEXUS_PROXY}/content/repositories/fd.io.stable.1704.centos7/"
REPO=${REPO_NAME:-"master.centos7"}
REPO_CICN_URL="${NEXUS_PROXY}/content/repositories/fd.io.${REPO}"