X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=59f1a76b8528c7dda5196a9e0fc6658dbf72e071;hb=5e0c5ff9c0d71bf495bb23e23e0ab4c5fffe00e8;hp=9868d9ae0d3c8f91462494711062deb641f743a8;hpb=6fbef2322870bbe1768537caecc3ca06bfd70dd7;p=vpp.git diff --git a/Makefile b/Makefile index 9868d9ae0d3..59f1a76b852 100644 --- a/Makefile +++ b/Makefile @@ -129,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_DEVEL_DEPS = libboost_headers1_68_0-devel-1.68.0 libboost_thread1_68_0-devel-1.68.0 gcc RPM_SUSE_PYTHON_DEPS += python2-ply python2-virtualenv endif ifeq ($(SUSE_ID),15.0) - RPM_SUSE_DEVEL_DEPS = libboost_headers-devel libboost_thread-devel gcc6 + 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 += python2-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 @@ -296,7 +296,7 @@ else ifneq ("$(wildcard /etc/redhat-release)","") ifeq ($(OS_ID),rhel) @sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms else ifeq ($(OS_ID),centos) - @sudo -E yum install $(CONFIRM) centos-release-scl-rh + @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 @@ -310,7 +310,7 @@ else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID)) @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) @@ -489,7 +489,10 @@ 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) + +pkg-deb-debug: + $(call make,$(PLATFORM)_debug,vpp-package-deb) pkg-rpm: dist make -C extras/rpm @@ -575,5 +578,3 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04) $(call banner,"Running tests") @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test endif - -