libmemif: don't consume rx queue interrupt, if memif_rx_burst fails

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 1a9ff86..fde91c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,15 +65,19 @@ DEB_DEPENDS  = curl build-essential autoconf automake ccache
 DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
-DEB_DEPENDS += python-all python3-all python3-setuptools python-dev
+DEB_DEPENDS += python-all python3-all python3-setuptools
 DEB_DEPENDS += python-virtualenv python-pip libffi6 check
 DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
 DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
 DEB_DEPENDS += python3-venv  # ensurepip
 DEB_DEPENDS += python3-dev   # needed for python3 -m pip install psutil
 # python3.6 on 16.04 requires python36-dev
- 
-ifeq ($(OS_VERSION_ID),14.04)
+
+ifeq ($(OS_VERSION_ID),16.04)
+       DEB_DEPENDS += python-dev
+       DEB_DEPENDS += libssl-dev
+else ifeq ($(OS_VERSION_ID),18.04)
+       DEB_DEPENDS += python-dev
        DEB_DEPENDS += libssl-dev
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
        DEB_DEPENDS += libssl-dev
@@ -203,6 +207,8 @@ help:
        @echo " run-vat              - run vpp-api-test tool"
        @echo " pkg-deb              - build DEB packages"
        @echo " pkg-deb-debug        - build DEB debug packages"
+       @echo " pkg-snap             - build SNAP package"
+       @echo " snap-clean           - clean up snap build environment"
        @echo " vom-pkg-deb          - build vom DEB packages"
        @echo " vom-pkg-deb-debug    - build vom DEB debug packages"
        @echo " pkg-rpm              - build RPM packages"
@@ -574,6 +580,20 @@ run-vat:
 pkg-deb:
        $(call make,$(PLATFORM),vpp-package-deb)
 
+.PHONY: pkg-snap
+pkg-snap:
+       cd extras/snap ;                        \
+        ./prep ;                               \
+       SNAPCRAFT_BUILD_ENVIRONMENT_MEMORY=8G   \
+       SNAPCRAFT_BUILD_ENVIRONMENT_CPU=6       \
+       snapcraft --debug
+
+.PHONY: snap-clean
+snap-clean:
+       cd extras/snap ;                        \
+        snapcraft clean ;                      \
+       rm -f *.snap *.tgz
+
 .PHONY: vom-pkg-deb
 vom-pkg-deb: pkg-deb
        $(call make,$(PLATFORM),vom-package-deb)