Enable PF_RING kernel module build for all distributions

.travis.yml

@@ -4,22 +4,10 @@ compiler:
   - clang
 before_install:
   - sudo apt-get update; true
-  - sudo apt-get install -y libboost-all-dev libgpm-dev libncurses5-dev liblog4cpp5-dev libnuma-dev libgeoip-dev libpcap-dev clang cmake git autoconf
 before_script:
   - pwd > /tmp/old_current_path
-  - wget https://github.com/ntop/PF_RING/archive/v6.0.3.tar.gz -OPF_RING-6.0.3.tar.gz
-  - tar -xf PF_RING-6.0.3.tar.gz
-  - sudo apt-get update
-  - sudo apt-get install -y build-essential bison flex libnuma-dev wget tar make
-  - cd PF_RING-6.0.3; sudo cp kernel/linux/pf_ring.h /usr/include/linux; cd userland/lib; ./configure --prefix=/opt/pf_ring; make; sudo make install
-  - cd `cat /tmp/old_current_path`
-  - git clone https://github.com/pavel-odintsov/nDPI.git
-  - cd nDPI
-  - ./autogen.sh
-  - ./configure --prefix=/opt/ndpi
-  - sudo make install
-  - cd `cat /tmp/old_current_path`
   - sudo perl src/fastnetmon_install.pl --use-git-master
+  - cd `cat /tmp/old_current_path`
   - cd src
 script: mkdir -p build; cd build; cmake ..; make
 notifications:

src/fastnetmon_install.pl

@@ -28,7 +28,9 @@ GetOptions('use-git-master' => \$we_use_code_from_master);
 
 my $we_have_ndpi_support = '';
 my $we_have_luajit_support = '';
-my $we_have_pfring_support = '';
+
+# Actually, we haven't PF_RING on some platforms
+my $we_have_pfring_support = 1;
 
 if ($we_use_code_from_master) {
     $we_have_ndpi_support = 1;
@@ -41,7 +43,9 @@ main();
 sub main {
     detect_distribution();
 
+    if ($we_have_pfring_support) {
         install_pf_ring();
+    }
 
     if ($we_have_ndpi_support) {
         install_ndpi();
@@ -303,14 +307,6 @@ sub install_pf_ring {
     my $kernel_version = `uname -r`;
     chomp $kernel_version;
 
-    my $we_could_install_kernel_modules = 1;
-
-    # TODO: we should offer some way to build only userspace library 
-    if (-e "/.dockerinit") {
-        # On Docker we can't build kernel modules
-        $we_could_install_kernel_modules = 0;
-    }
- 
     print "Install PF_RING dependencies with package manager\n";
 
     if ($distro_type eq 'debian' or $distro_type eq 'ubuntu') {
@@ -319,7 +315,6 @@ sub install_pf_ring {
             'libnuma-dev', 'wget', 'tar', 'make', 'dpkg-dev', 'dkms', 'debhelper');
   
         # Install kernel headers only when we could compile kernel modules there
-        if ($we_could_install_kernel_modules) {
         my $kernel_headers_package_name = "linux-headers-$kernel_version";
 
         if ($appliance_name eq 'vyos') { 
@@ -328,7 +323,6 @@ sub install_pf_ring {
         }
 
         push @debian_packages_for_pfring, $kernel_headers_package_name;
-        }    
 
         # We install one package per apt-get call because installing multiple packages in one time could fail of one
         # pacakge broken
@@ -340,7 +334,7 @@ sub install_pf_ring {
             }  
         }
 
-        if ($appliance_name eq 'vyos' && $we_could_install_kernel_modules) {
+        if ($appliance_name eq 'vyos') {
             # By default we waven't this symlink and should add it manually
 
             # x86_64 or i686
@@ -374,6 +368,8 @@ sub install_pf_ring {
         }
     }
 
+    # Sometimes we do not want to build kernel module (Docker, KVM and other cases)
+    my $we_could_install_kernel_modules = 1;
     if ($we_could_install_kernel_modules) {
         print "Download PF_RING $pf_ring_version sources\n";
 
@@ -401,18 +397,17 @@ sub install_pf_ring {
             if (scalar grep (/\[PF_RING\] Initialized correctly/, @dmesg) > 0) {
                 print "PF_RING loaded correctly\n";
 
-                $we_have_pfring_support = 1;
             } else {
-                warn "PF_RING load error! We disable PF_RING plugin\n";
+                warn "PF_RING load error! Please fix this issue manually\n";
 
-                $we_have_pfring_support = '';
+                # We need this headers for building userspace libs
+                `cp kernel/linux/pf_ring.h /usr/include/linux`;
             }
         } else {
             warn "Can't download PF_RING source code. Disable support of PF_RING\n";
         } 
     }
 
-    if ($we_have_pfring_support) {
     print "Build PF_RING lib\n";
     # Because we can't run configure from another folder because it can't find ZC dependency :(
     chdir "$pf_ring_sources_path/userland/lib";
@@ -427,7 +422,6 @@ sub install_pf_ring {
     print "Add pf_ring to ld.so.conf\n";
     put_library_path_to_ld_so("/etc/ld.so.conf.d/pf_ring.conf", "/opt/pf_ring/lib");
 }
-}
 
 sub install_fastnetmon {
     print "Install FastNetMon dependency list\n";