X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=015db5294319a4a06530dfc7ae7866c0f55a3a62;hb=eba31ecebed1a7d168da17194cab7a8955761f2b;hp=d5cc9f3785a80b6e5a8b4b97fe4dced5a5583e3c;hpb=b8c72a4a8d8bd330ab62dc0c9461cac2b137575b;p=vpp.git diff --git a/Makefile b/Makefile index d5cc9f3785a..015db529431 100644 --- a/Makefile +++ b/Makefile @@ -65,8 +65,8 @@ DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6 check -DEB_DEPENDS += libboost-all-dev libffi-dev python-ply libmbedtls-dev -DEB_DEPENDS += cmake ninja-build +DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev +DEB_DEPENDS += cmake ninja-build uuid-dev ifeq ($(OS_VERSION_ID),14.04) DEB_DEPENDS += openjdk-8-jdk-headless DEB_DEPENDS += libssl-dev @@ -82,33 +82,31 @@ else DEB_DEPENDS += libssl-dev endif -RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils +RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel RPM_DEPENDS += apr-devel RPM_DEPENDS += numactl-devel RPM_DEPENDS += check check-devel RPM_DEPENDS += boost boost-devel RPM_DEPENDS += selinux-policy selinux-policy-devel -RPM_DEPENDS += cmake3 ninja-build +RPM_DEPENDS += ninja-build +RPM_DEPENDS += libuuid-devel -ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25) - RPM_DEPENDS += subunit subunit-devel - RPM_DEPENDS += openssl-devel - RPM_DEPENDS += python-devel python2-ply - RPM_DEPENDS += python2-virtualenv - RPM_DEPENDS += mbedtls-devel - RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' -else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0) +ifeq ($(OS_ID),fedora) + RPM_DEPENDS += dnf-utils RPM_DEPENDS += subunit subunit-devel RPM_DEPENDS += compat-openssl10-devel - RPM_DEPENDS += python2-devel python2-ply + RPM_DEPENDS += python2-devel python34-ply RPM_DEPENDS += python2-virtualenv RPM_DEPENDS += mbedtls-devel + RPM_DEPENDS += cmake RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' else + RPM_DEPENDS += yum-utils RPM_DEPENDS += openssl-devel - RPM_DEPENDS += python-devel python-ply + RPM_DEPENDS += python-devel python34-ply RPM_DEPENDS += python-virtualenv RPM_DEPENDS += devtoolset-7 + RPM_DEPENDS += cmake3 RPM_DEPENDS_GROUPS = 'Development Tools' endif @@ -119,10 +117,10 @@ RPM_DEPENDS += chrpath libffi-devel rpm-build SUSE_NAME= $(shell grep '^NAME=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2) SUSE_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g' | cut -d' ' -f2) RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath -RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python-ply +RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python3-ply RPM_SUSE_DEVEL_DEPS = glibc-devel-static java-1_8_0-openjdk-devel libnuma-devel -RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel +RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel libuuid-devel RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros @@ -131,14 +129,14 @@ RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build ifeq ($(OS_ID),opensuse) ifeq ($(SUSE_NAME),Tumbleweed) - RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc - RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv + RPM_SUSE_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0 libboost_thread1_68_0-devel-1.68.0 gcc + RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv endif ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 - RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv + RPM_SUSE_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0 libboost_thread1_68_0-devel-1.68.0 gcc6 + RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv else - RPM_SUSE_DEVEL_DEPS += boost_1_61-devel gcc6 + RPM_SUSE_DEVEL_DEPS += libboost_headers1_68_0-devel-1.68.0 gcc6 RPM_SUSE_PYTHON_DEPS += python-virtualenv endif endif @@ -146,7 +144,7 @@ endif ifeq ($(OS_ID),opensuse-leap) ifeq ($(SUSE_ID),15.0) RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 - RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv + RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv endif endif @@ -206,6 +204,7 @@ help: @echo " test-help - show help on test framework" @echo " run-vat - run vpp-api-test tool" @echo " pkg-deb - build DEB packages" + @echo " vom-pkg-deb - build vom DEB packages" @echo " pkg-rpm - build RPM packages" @echo " install-ext-deps - install external development dependencies" @echo " ctags - (re)generate ctags database" @@ -297,18 +296,25 @@ endif else ifneq ("$(wildcard /etc/redhat-release)","") ifeq ($(OS_ID),rhel) @sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms + @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) + @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) + @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib else ifeq ($(OS_ID),centos) - @sudo -E yum install $(CONFIRM) centos-release-scl-rh -endif + @sudo -E yum install $(CONFIRM) centos-release-scl-rh epel-release @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib +else ifeq ($(OS_ID),fedora) + @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) + @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) + @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib +endif else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) @sudo -E zypper refresh @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) @sudo -E zypper refresh - @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) + @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID)) @sudo -E zypper refresh @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) @@ -359,6 +365,7 @@ wipedist: wipe: wipedist test-wipe $(BR)/.deps.ok $(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS))) + @find . -type f -name "*.api.json" ! -path "./test/*" -exec rm {} \; rebuild: wipe build @@ -428,6 +435,7 @@ test-wipe-doc: @make -C test wipe-doc test-cov: + @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install japi-install $(eval EXTENDED_TESTS=yes) $(call test,vpp,vpp_gcov,cov) @@ -486,7 +494,18 @@ run-vat: @$(SUDO) $(BR)/install-$(PLATFORM)_debug-native/vpp/bin/vpp_api_test pkg-deb: - $(call make,$(PLATFORM),install-deb) + $(call make,$(PLATFORM),vpp-package-deb) + +vom-pkg-deb: + $(call make,$(PLATFORM),vpp-package-deb) + $(call make,$(PLATFORM),vom-package-deb) + +pkg-deb-debug: + $(call make,$(PLATFORM)_debug,vpp-package-deb) + +vom-pkg-deb-debug: + $(call make,$(PLATFORM)_debug,vpp-package-deb) + $(call make,$(PLATFORM)_debug,vom-package-deb) pkg-rpm: dist make -C extras/rpm @@ -572,5 +591,3 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04) $(call banner,"Running tests") @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test endif - -