Add missing counters for P2P ethernet interfaces

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 0d21f33..1cce928 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -55,8 +55,10 @@ else ifeq ($(filter rhel centos fedora opensuse,$(OS_ID)),$(OS_ID))
 PKG=rpm
 endif
 
+# +libganglia1-dev if building the gmond plugin
+
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
-DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
+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 nasm indent
 DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
@@ -79,9 +81,16 @@ else
        RPM_DEPENDS += python-virtualenv
        RPM_DEPENDS_GROUPS = 'Development Tools'
 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
-EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
+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
 else
@@ -90,7 +99,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
@@ -269,12 +278,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,' \
@@ -421,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)