NAT64: Move IPv6-IPv4 virtual reassembly code from MAP-T to common library (VPP-708)

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 133c3d4..55365b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,11 @@ RPM_DEPENDS_GROUPS = 'Development Tools'
 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
-ifeq ($(OS_ID)),fedora)
-ifeq ($(OS_VERSION_ID),25)
+ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
        RPM_DEPENDS += python2-virtualenv
 else
        RPM_DEPENDS += python-virtualenv
 endif
-endif
 RPM_DEPENDS += lcov chrpath libffi-devel
 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
@@ -214,18 +212,30 @@ else
        $(shell $(BR)/scripts/version > $(BR)/scripts/.version)
 endif
 
-dist:  $(BR)/scripts/.version
-       $(MAKE) verstring=$(PLATFORM)-$(shell cat $(BR)/scripts/.version) prefix=$(PLATFORM) distversion
-
-distversion:   $(BR)/scripts/.version
-       $(BR)/scripts/verdist ${BR} ${prefix}-$(shell $(BR)/scripts/version rpm-version) ${verstring}
-       mv $(verstring).tar.gz $(BR)/rpm
+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
+       @tar --append \
+         --file $(DIST_FILE) \
+         --transform='s,.*/.version,$(DIST_SUBDIR)/src/scripts/.version,' \
+         $(BR)/.version
+       @$(RM) $(BR)/.version $(DIST_FILE).xz
+       @xz -v --threads=0 $(DIST_FILE)
+       @$(RM) $(BR)/vpp-latest.tar.xz
+       @ln -rs $(DIST_FILE).xz $(BR)/vpp-latest.tar.xz
 
 build: $(BR)/.bootstrap.ok
        $(call make,$(PLATFORM)_debug,vpp-install)
 
 wipedist:
-       $(RM) $(BR)/scripts/.version $(BR)/rpm/*.tar.gz
+       @$(RM) $(BR)/*.tar.xz
 
 wipe: wipedist $(BR)/.bootstrap.ok
        $(call make,$(PLATFORM)_debug,vpp-wipe)
@@ -351,7 +361,7 @@ pkg-deb:
        $(call make,$(PLATFORM),install-deb)
 
 pkg-rpm: dist
-       $(call make,$(PLATFORM),install-rpm)
+       make -C extras/rpm
 
 dpdk-install-dev:
        make -C dpdk install-$(PKG)
@@ -411,8 +421,10 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
        $(call banner,"Building for PLATFORM=vpp using clang")
        @make -C build-root CC=clang PLATFORM=vpp TAG=vpp_clang wipe-all install-packages
 endif
+       $(call banner,"Building sample-plugin")
+       @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install
        $(call banner,"Building $(PKG) packages")
        @make pkg-$(PKG)
-       @make test-all
+       @make test