acl-plugin: multicore: CSIT c100k 2-core stateful ACL test does not pass (VPP-912)

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 46c51dd..2c43a0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ 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
+RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -274,12 +274,17 @@ DIST_FILE = $(BR)/vpp-$(shell src/scripts/version).tar
 DIST_SUBDIR = vpp-$(shell src/scripts/version|cut -f1 -d-)
 
 dist:
-       @git archive \
-         --prefix=$(DIST_SUBDIR)/ \
-         --format=tar \
-         -o $(DIST_FILE) \
-         HEAD
-       @git describe > $(BR)/.version
+       @if git rev-parse 2> /dev/null ; then \
+           git archive \
+             --prefix=$(DIST_SUBDIR)/ \
+             --format=tar \
+             -o $(DIST_FILE) \
+           HEAD ; \
+           git describe > $(BR)/.version ; \
+       else \
+           (cd .. ; tar -cf $(DIST_FILE) $(DIST_SUBDIR) --exclude=*.tar) ; \
+           src/scripts/version > $(BR)/.version ; \
+       fi
        @tar --append \
          --file $(DIST_FILE) \
          --transform='s,.*/.version,$(DIST_SUBDIR)/src/scripts/.version,' \