ACL-plugin: fix coverity issue

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 6ac6f6e..c08115d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ CCACHE_DIR?=$(BR)/.ccache
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no
+export AESNI?=y
 
 ,:=,
 define disable_plugins
@@ -72,12 +73,19 @@ else
 endif
 
 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 numactl-devel
+RPM_DEPENDS += apr-devel
+RPM_DEPENDS += openssl-devel
+RPM_DEPENDS += numactl-devel
 ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+       RPM_DEPENDS += python-devel
+       RPM_DEPENDS += python2-virtualenv
+       RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
+else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
+       RPM_DEPENDS += python2-devel
        RPM_DEPENDS += python2-virtualenv
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
+       RPM_DEPENDS += python-devel
        RPM_DEPENDS += python-virtualenv
        RPM_DEPENDS_GROUPS = 'Development Tools'
 endif
@@ -87,19 +95,13 @@ endif
 RPM_DEPENDS += chrpath libffi-devel rpm-build
 ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += nasm
-else
+else ifeq ($(findstring y,$(AESNI)),y)
        RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
 endif
-EPEL_DEPENDS = libconfuse-devel epel-rpm-macros
-ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
-       EPEL_DEPENDS += lcov
-else
-       RPM_DEPENDS += lcov
-endif
 
 RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static
 RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel
-RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm numactl-devel
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm libnuma-devel
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -206,13 +208,9 @@ ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
        fi ; \
        exit 0
 else ifneq ("$(wildcard /etc/redhat-release)","")
-       @for i in $(RPM_DEPENDS) $(EPEL_DEPENDS) ; do \
+       @for i in $(RPM_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                                                     ;    \
+           MISSING+=$$(rpm -q $$RPM | grep "^package")    ;    \
        done                                                       ;    \
        if [ -n "$$MISSING" ] ; then \
          echo "Please install missing RPMs: \n$$MISSING\n" ; \
@@ -255,7 +253,6 @@ endif
 else ifneq ("$(wildcard /etc/redhat-release)","")
        @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
        @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
-       @sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
        @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
 else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
        @sudo -E zypper -n install -y $(RPM_SUSE_DEPENDS)