ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
PKG=deb
-else ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID))
PKG=rpm
endif
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 += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf nasm
+DEB_DEPENDS += lcov chrpath autoconf nasm indent
+DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
ifeq ($(OS_VERSION_ID),14.04)
DEB_DEPENDS += openjdk-8-jdk-headless
else
DEB_DEPENDS += default-jdk-headless
endif
-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 python-virtualenv lcov chrpath
-EPEL_DEPENDS = libconfuse-devel ganglia-devel
+RPM_DEPENDS += python-devel
+ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+ RPM_DEPENDS += python2-virtualenv
+ RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
+else
+ RPM_DEPENDS += python-virtualenv
+ RPM_DEPENDS_GROUPS = 'Development Tools'
+endif
+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 ($(filter rhel centos,$(OS_ID)),$(OS_ID))
+ EPEL_DEPENDS += lcov
+else
+ RPM_DEPENDS += lcov
+endif
ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
exit 1 ; \
fi ; \
exit 0
+else ifneq ("$(wildcard /etc/redhat-release)","")
+ @for i in $(RPM_DEPENDS) $(EPEL_DEPENDS) ; do \
+ RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3) ; \
+ if [[ "$$RPM" =~ "epel-release-latest" ]] ; then \
+ MISSING+=$$(rpm -q epel-release | grep "^package") ; \
+ else \
+ MISSING+=$$(rpm -q $$RPM | grep "^package") ; \
+ fi ; \
+ done ; \
+ if [ -n "$$MISSING" ] ; then \
+ echo "Please install missing RPMs: \n$$MISSING\n" ; \
+ echo "by executing \"make install-dep\"\n" ; \
+ exit 1 ; \
+ fi ; \
+ exit 0
endif
@echo "SOURCE_PATH = $(WS_ROOT)" > $(BR)/build-config.mk
@echo "#!/bin/bash\n" > $(BR)/path_setup
@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
@sudo -E yum install $(CONFIRM) --enablerepo=epel $(EPEL_DEPENDS)
- @sudo -E debuginfo-install $(CONFIRM) glibc-2.17-106.el7_2.4.x86_64 openssl-libs-1.0.1e-51.el7_2.4.x86_64 zlib-1.2.7-15.el7.x86_64
+ @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib
else
$(error "This option currently works only on Ubuntu or Centos systems")
endif
$(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)
export VPP_PYTHON_PREFIX=$(BR)/python
+libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
+
define test
$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
+ $(eval libs:=lib lib64)
make -C test \
+ TEST_DIR=$(WS_ROOT)/test \
VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
- VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
+ VPP_TEST_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \
VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
- LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
+ LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \
EXTENDED_TESTS=$(EXTENDED_TESTS) \
+ PYTHON=$(PYTHON) \
$(3)
endef
test: bootstrap
- $(call test,vpp_lite,vpp_lite,test)
+ $(call test,vpp,vpp,test)
test-debug: bootstrap
- $(call test,vpp_lite,vpp_lite_debug,test)
+ $(call test,vpp,vpp_debug,test)
test-all: bootstrap
$(eval EXTENDED_TESTS=yes)
- $(call test,vpp_lite,vpp_lite,test)
+ $(call test,vpp,vpp,test)
test-all-debug: bootstrap
$(eval EXTENDED_TESTS=yes)
- $(call test,vpp_lite,vpp_lite_debug,test)
+ $(call test,vpp,vpp_debug,test)
test-help:
@make -C test help
@make -C test wipe
test-shell: bootstrap
- $(call test,vpp_lite,vpp_lite,shell)
+ $(call test,vpp,vpp,shell)
test-shell-debug: bootstrap
- $(call test,vpp_lite,vpp_lite_debug,shell)
+ $(call test,vpp,vpp_debug,shell)
test-doc:
@make -C test doc
@make -C test wipe-doc
test-cov: bootstrap
- $(call test,vpp_lite,vpp_lite_gcov,cov)
+ $(eval EXTENDED_TESTS=yes)
+ $(call test,vpp,vpp_gcov,cov)
test-wipe-cov:
@make -C test wipe-cov
@make -C test checkstyle
retest:
- $(call test,vpp_lite,vpp_lite,retest)
+ $(call test,vpp,vpp,retest)
retest-debug:
- $(call test,vpp_lite,vpp_lite_debug,retest)
+ $(call test,vpp,vpp_debug,retest)
STARTUP_DIR ?= $(PWD)
ifeq ("$(wildcard $(STARTUP_CONF))","")
@echo "WARNING: STARTUP_CONF not defined or file doesn't exist."
@echo " Running with minimal startup config: $(MINIMAL_STARTUP_CONF)\n"
@cd $(STARTUP_DIR) && \
- sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(1)/vpp/lib64/vpp_plugins
+ sudo $(2) $(1)/vpp/bin/vpp $(MINIMAL_STARTUP_CONF) plugin_path $(wildcard $(1)/vpp/lib*/vpp_plugins)
endef
else
define run
@cd $(STARTUP_DIR) && \
- sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(1)/vpp/lib64/vpp_plugins
+ sudo $(2) $(1)/vpp/bin/vpp $(shell cat $(STARTUP_CONF) | sed -e 's/#.*//') plugin_path $(wildcard $(1)/vpp/lib*/vpp_plugins)
endef
endif
$(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)
verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
$(call banner,"Building for PLATFORM=vpp using gcc")
@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
- $(call banner,"Building for PLATFORM=vpp_lite using gcc")
- @make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
$(call banner,"Installing dependencies")
@sudo -E apt-get update
$(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
+ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
+ @make test
+endif
Code Review / vpp.git / blobdiff