X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=24b0af3067aab038547e7960e40616558f88e653;hb=d335dac3e2fe9704a9686f53017e17d4b5ba9ed7;hp=10b210c1930ab308bb489c959a84831c2ab7056a;hpb=c21d59fa3354c2a1f7f4510793605104c9348e1c;p=vpp.git diff --git a/Makefile b/Makefile index 10b210c1930..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),) @@ -339,18 +339,25 @@ define banner @echo " " endef -verify: $(BR)/.bootstrap.ok +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 - @make install-dep @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 - $(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),centos) + $(call banner,"Building rpm packages") + @make pkg-rpm +endif + +