X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=24b0af3067aab038547e7960e40616558f88e653;hb=d335dac3e2fe9704a9686f53017e17d4b5ba9ed7;hp=5d20bd23350f7033f0a864ec80c2260a375bbb54;hpb=7f3c36bb852017c2edbeb609a5e10446a7605157;p=vpp.git diff --git a/Makefile b/Makefile index 5d20bd23350..24b0af3067a 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ 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 +RPM_DEPENDS += python-devel python-virtualenv EPEL_DEPENDS = libconfuse-devel ganglia-devel ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),) @@ -118,6 +118,9 @@ help: @echo " DPDK_VERSION = $(DPDK_VERSION)" $(BR)/.bootstrap.ok: +ifeq ($(findstring y,$(UNATTENDED)),y) + make install-dep +endif ifeq ($(OS_ID),ubuntu) @MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \ if [ -n "$$MISSING" ] ; then \ @@ -212,7 +215,7 @@ build-vpp-api: $(BR)/.bootstrap.ok VPP_PYTHON_PREFIX=$(BR)/python define test - $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install vpp-api-test-install,) + $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-api-install plugins-install vpp-install,) make -C test \ VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \ VPP_TEST_API_TEST_BIN=$(BR)/install-$(2)-native/vpp-api-test/bin/vpp_api_test \ @@ -329,6 +332,32 @@ doxygen: wipe-doxygen: $(call make-doxy) -verify: $(BR)/.bootstrap.ok +define banner + @echo "========================================================================" + @echo " $(1)" + @echo "========================================================================" + @echo " " +endef + +verify: install-dep $(BR)/.bootstrap.ok + $(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),ubuntu) +ifeq ($(OS_VERSION_ID),16.04) + $(call banner,"Installing dependencies") + @sudo -E apt-get update + @sudo -E apt-get $(CONFIRM) $(FORCE) install clang + $(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 deb packages") + @make pkg-deb +endif +ifeq ($(OS_ID),centos) + $(call banner,"Building rpm packages") + @make pkg-rpm +endif + +