diff options
| author |   Dave Barach <dave@barachs.net> | 2016-02-02 10:57:15 -0500 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-02-02 21:36:00 +0000 |
| commit | b10277dedc04da0c4334fadf2ac6b18a453f6491 (patch) | |
| tree | d8e043df2cb2d15981391fd34f85df378239e364 | |
| parent | 0bcc9d511e52a9832e723825b4c84d9332d7025b (diff) | |
Enable ganglia module integration build
Change-Id: Ia49e9f246e8318ba74195c3397472fb0c102389b
Signed-off-by: Dave Barach <dave@barachs.net>
| -rw-r--r-- | build-data/packages/gmod.mk | 2 | ||||
| -rw-r--r-- | build-data/platforms/vpp.mk | 2 | ||||
| -rw-r--r-- | build-root/vagrant/bootstrap.centos7.sh | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/build-data/packages/gmod.mk b/build-data/packages/gmod.mk index 3f9a9f7f1fe..a6ba42d093b 100644 --- a/build-data/packages/gmod.mk +++ b/build-data/packages/gmod.mk @@ -3,7 +3,7 @@ gmod_configure_depend = vppinfra-install svm-install gmod_configure_args = --libdir=$(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/ganglia gmod_CPPFLAGS = $(call installed_includes_fn, vppinfra svm) -gmod_CPPFLAGS += -I/usr/include/apr-1.0 -I/usr/include +gmod_CPPFLAGS += -I/usr/include/apr-1.0 -I/usr/include/apr-1 -I/usr/include gmod_LDFLAGS = $(call installed_libs_fn, vppinfra svm) gmod_image_include = echo $(arch_lib_dir)/ganglia/libgmodvpp.so etc diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index a09b0307db5..4c75d74d02a 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -16,7 +16,7 @@ vpp_arch = native vpp_native_tools = vppapigen vpp_root_packages = vpp vlib vlib-api vnet svm dpdk vpp-api-test \ - vpp-japi + vpp-japi gmod vpp_configure_args_vpp = --with-dpdk vnet_configure_args_vpp = --with-dpdk diff --git a/build-root/vagrant/bootstrap.centos7.sh b/build-root/vagrant/bootstrap.centos7.sh index f55e68a242d..d874d3c37cf 100644 --- a/build-root/vagrant/bootstrap.centos7.sh +++ b/build-root/vagrant/bootstrap.centos7.sh @@ -11,6 +11,14 @@ yum install glibc-static -y # Install jdk and maven yum install -y java-1.8.0-openjdk-devel +# Install EPEL +yum install -y epel-release + +# Install components to build Ganglia modules +yum install -y apr-devel +yum install -y --enablerepo=epel libconfuse-devel +yum install -y --enablerepo=epel ganglia-devel + # Load the uio kernel module modprobe uio_pci_generic |