Enable ganglia module integration build

Change-Id: Ia49e9f246e8318ba74195c3397472fb0c102389b
Signed-off-by: Dave Barach <[email protected]>

diff --git a/build-data/packages/gmod.mk b/build-data/packages/gmod.mk
index 3f9a9f7..a6ba42d 100644 (file)
--- 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 a09b030..4c75d74 100644 (file)
--- 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 f55e68a..d874d3c 100644 (file)
--- 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