X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=1cce928aa1a2453356e24a672a1034d8a11137e3;hb=4f80b81d4a7ab537b7a6ede88abed26f278c0f26;hp=09a802a2c83a3b722d1061b35a97b37172e25b54;hpb=8d48722b0932e7857f93c4e06ba9b2dff8bd5cad;p=vpp.git diff --git a/Makefile b/Makefile index 09a802a2c83..1cce928aa1a 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,11 @@ endif # +ganglia-devel if building the ganglia plugin 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 +ifeq ($(OS_ID),fedora) + RPM_DEPENDS += nasm +else + RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm +endif EPEL_DEPENDS = libconfuse-devel epel-rpm-macros ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID)) EPEL_DEPENDS += lcov @@ -95,7 +99,7 @@ endif RPM_SUSE_DEPENDS = autoconf automake bison ccache chrpath distribution-release gcc6 glibc-devel-static RPM_SUSE_DEPENDS += java-1_8_0-openjdk-devel libopenssl-devel libtool lsb-release make openssl-devel -RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow +RPM_SUSE_DEPENDS += python-devel python-pip python-rpm-macros shadow nasm ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),) STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf @@ -431,6 +435,9 @@ pkg-deb: pkg-rpm: dist make -C extras/rpm +pkg-srpm: dist + make -C extras/rpm srpm + dpdk-install-dev: make -C dpdk install-$(PKG)