ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable ganglia module integration build

Browse Source 
Change-Id: Ia49e9f246e8318ba74195c3397472fb0c102389b
Signed-off-by: Dave Barach <dave@barachs.net>
This commit is contained in:
Dave Barach
2016-02-02 10:57:15 -05:00
committed by Gerrit Code Review
parent 0bcc9d511e
commit b10277dedc
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-data/packages/gmod.mk
View File

@ -3,7 +3,7 @@ gmod_configure_depend = vppinfra-install svm-install
gmod_configure_args = --libdir=$(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/ganglia gmod_configure_args = --libdir=$(PACKAGE_INSTALL_DIR)/$(arch_lib_dir)/ganglia
gmod_CPPFLAGS = $(call installed_includes_fn, vppinfra svm) 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_LDFLAGS = $(call installed_libs_fn, vppinfra svm)
gmod_image_include = echo $(arch_lib_dir)/ganglia/libgmodvpp.so etc gmod_image_include = echo $(arch_lib_dir)/ganglia/libgmodvpp.so etc

2
build-data/platforms/vpp.mk
View File

@ -16,7 +16,7 @@ vpp_arch = native
vpp_native_tools = vppapigen vpp_native_tools = vppapigen
vpp_root_packages = vpp vlib vlib-api vnet svm dpdk vpp-api-test \ vpp_root_packages = vpp vlib vlib-api vnet svm dpdk vpp-api-test \
vpp-japi vpp-japi gmod
vpp_configure_args_vpp = --with-dpdk vpp_configure_args_vpp = --with-dpdk
vnet_configure_args_vpp = --with-dpdk vnet_configure_args_vpp = --with-dpdk

8
build-root/vagrant/bootstrap.centos7.sh
View File

@ -11,6 +11,14 @@ yum install glibc-static -y
# Install jdk and maven # Install jdk and maven
yum install -y java-1.8.0-openjdk-devel 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 # Load the uio kernel module
modprobe uio_pci_generic modprobe uio_pci_generic