Fix small issues in ACL api

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 2c43a0e..c1a7cbb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,11 @@ endif
 # +ganglia-devel if building the ganglia plugin
 
 RPM_DEPENDS += chrpath libffi-devel rpm-build
-RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
+ifeq ($(OS_ID),fedora)
+       RPM_DEPENDS += nasm
+else
+       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
@@ -431,6 +435,9 @@ pkg-deb:
 pkg-rpm: dist
        make -C extras/rpm
 
+pkg-srpm: dist
+       make -C extras/rpm srpm
+
 dpdk-install-dev:
        make -C dpdk install-$(PKG)
 
@@ -494,7 +501,7 @@ endif
        $(call banner,"Building $(PKG) packages")
        @make pkg-$(PKG)
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
-       @make test
+       @make COMPRESS_FAILED_TEST_LOGS=yes test
 endif