build: remove nasm

[vpp.git] / build / external / Makefile

diff --git a/build/external/Makefile b/build/external/Makefile
index 0c2d837..9f6a6ce 100644 (file)
--- a/build/external/Makefile
+++ b/build/external/Makefile
@@ -19,7 +19,7 @@ MAKE ?= make
 MAKE_ARGS ?= -j
 BUILD_DIR        ?= $(CURDIR)/_build
 INSTALL_DIR      ?= $(CURDIR)/_install
-PKG_VERSION ?= $(shell git describe --abbrev=0 | cut -d- -f1 | cut -dv -f2)
+PKG_VERSION ?= $(shell git describe --abbrev=0 --match 'v[0-9]*' | cut -d- -f1 | cut -dv -f2 | cut -d. -f1,2)
 PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l)
 JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\
        $(shell grep -c ^processor /proc/cpuinfo), 2)
@@ -27,22 +27,30 @@ JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\
 B := $(BUILD_DIR)
 I := $(INSTALL_DIR)
 
+ifneq ($(shell which cmake3),)
+CMAKE?=cmake3
+else
+CMAKE?=cmake
+endif
+
+ARCH_X86_64=$(filter x86_64,$(shell uname -m))
+
 include packages.mk
-include packages/nasm.mk
 include packages/ipsec-mb.mk
 include packages/quicly.mk
 include packages/dpdk.mk
 include packages/rdma-core.mk
+include packages/libbpf.mk
 
 .PHONY: clean
 clean:
        @rm -rf $(B) $(I)
 
 .PHONY: install
-install: dpdk-install rdma-core-install quicly-install
+install: $(if $(ARCH_X86_64), ipsec-mb-install) dpdk-install rdma-core-install quicly-install libbpf-install
 
 .PHONY: config
-config: dpdk-config rdma-core-config
+config: $(if $(ARCH_X86_64), ipsec-mb-config) dpdk-config rdma-core-config quicly-build
 
 ##############################################################################
 # .deb packaging
@@ -64,7 +72,7 @@ deb/debian/changelog: Makefile
 
 $(DEV_DEB): deb/debian/changelog
        @cd deb && dpkg-buildpackage -b -uc -us
-       @git clean -ffdx deb
+       git clean -fdx deb
 
 build-deb: $(DEV_DEB)
 
@@ -97,7 +105,7 @@ endif
 RPM_VER := $(PKG_VERSION)
 RPM_ARCH=$(shell rpm --eval "%{_arch}" 2> /dev/null)
 DEV_RPM=vpp-ext-deps-$(RPM_VER)-$(PKG_SUFFIX).$(RPM_ARCH).rpm
-INSTALLED_RPM_VER=$(shell rpm -q --queryformat '%{VERSION}-%{RELEASE}' vpp-ext-deps 2> /dev/null | grep -v "not inst")
+INSTALLED_RPM_VER=$(shell rpm -q --queryformat '%{VERSION}-%{RELEASE}' vpp-ext-deps 2> /dev/null | grep -v "vpp-ext-deps")
 
 .PHONY: build-rpm install-rpm check-rpm
 
@@ -108,13 +116,14 @@ $(DEV_RPM): Makefile rpm/vpp-ext-deps.spec
          --define "_release $(PKG_SUFFIX)" \
          $(CURDIR)/rpm/vpp-ext-deps.spec
        mv rpm/RPMS/$(RPM_ARCH)/*.rpm .
-       @git clean -ffdx rpm
+       @git clean -fdx rpm
 
 build-rpm: $(DEV_RPM)
 
 install-rpm:
 ifneq ($(INSTALLED_RPM_VER),$(RPM_VER)-$(PKG_SUFFIX))
        @$(MAKE) $(DEV_RPM)
+       sudo rpm -e vpp-ext-deps || true
        sudo rpm -Uih --force $(DEV_RPM)
 else
        @echo "=========================================================="