ACL-plugin does not match UDP next-header, VPP-687

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index ac571a6..8964329 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ endif
 
 ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
 PKG=deb
-else ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
@@ -50,7 +50,15 @@ endif
 RPM_DEPENDS_GROUPS = 'Development Tools'
 RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv lcov chrpath libffi-devel
+RPM_DEPENDS += python-devel
+ifeq ($(OS_ID)),fedora)
+ifeq ($(OS_VERSION_ID),25)
+       RPM_DEPENDS += python2-virtualenv
+else
+       RPM_DEPENDS += python-virtualenv
+endif
+endif
+RPM_DEPENDS += lcov chrpath libffi-devel
 RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
 
@@ -143,6 +151,21 @@ ifeq ($(OS_ID),ubuntu)
          exit 1 ; \
        fi ; \
        exit 0
+else ifneq ("$(wildcard /etc/redhat-release)","")
+       @for i in $(RPM_DEPENDS) $(EPEL_DEPENDS) ; do \
+           RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3)  ;   \
+           if [[ "$$RPM" =~ "epel-release-latest" ]] ; then            \
+               MISSING+=$$(rpm -q epel-release | grep "^package") ;    \
+           else                                                        \
+               MISSING+=$$(rpm -q $$RPM | grep "^package")        ;    \
+           fi                                                     ;    \
+       done                                                       ;    \
+       if [ -n "$$MISSING" ] ; then \
+         echo "Please install missing RPMs: \n$$MISSING\n" ; \
+         echo "by executing \"make install-dep\"\n" ; \
+         exit 1 ; \
+       fi ; \
+       exit 0
 endif
        @echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
        @echo "#!/bin/bash\n"                              > $(BR)/path_setup