diff --git a/.travis.yml b/.travis.yml index 244c5fe32..584deb8c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,11 @@ matrix: env: - DPDK_VER=17.02 - DPDK_DIR=dpdk-17.02 + - os: linux + compiler: gcc + dist: trusty + env: + - PF_RING=True - os: osx compiler: clang osx_image: xcode6.4 @@ -41,12 +46,14 @@ addons: apt: packages: - libpcap-dev + - libnuma-dev - net-tools before_script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./configure-mac_os_x.sh ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./configure-linux.sh --default; fi - if [[ ! -z $DPDK_VER ]]; then Deploy/build-dpdk.sh $DPDK_VER $DPDK_DIR && ./configure-linux.sh --dpdk --dpdk-home $PWD/$DPDK_DIR; fi + - if [[ ! -z $PF_RING ]]; then Deploy/build-pfring.sh && ./configure-linux.sh --pf-ring --pf-ring-home $PWD/PF_RING; fi - make all script: diff --git a/Deploy/build-pfring.sh b/Deploy/build-pfring.sh new file mode 100755 index 000000000..020b254a1 --- /dev/null +++ b/Deploy/build-pfring.sh @@ -0,0 +1,13 @@ +git clone https://github.com/ntop/PF_RING.git +cd PF_RING + +LATEST_TAG=$(git describe --tags --abbrev=0) +git checkout ${LATEST_TAG} + +cd kernel +make + +sudo insmod ./pf_ring.ko + +cd ../userland +make diff --git a/mk/PcapPlusPlus.mk.pf_ring b/mk/PcapPlusPlus.mk.pf_ring index 6f1635510..7d17dc203 100644 --- a/mk/PcapPlusPlus.mk.pf_ring +++ b/mk/PcapPlusPlus.mk.pf_ring @@ -7,6 +7,6 @@ PCAPPP_INCLUDES += -I$(PF_RING_HOME)/userland/lib -I$(PF_RING_HOME)/kernel PCAPPP_LIBS_DIR += -L$(PF_RING_HOME)/userland/lib # libs -PCAPPP_LIBS += -lpfring -lnuma -lrt +PCAPPP_LIBS += -l:libpfring.a -lnuma -lrt