Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add missing counters for P2P ethernet interfaces
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
2c43a0e
..
1cce928
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-85,7
+85,11
@@
endif
# +ganglia-devel if building the ganglia plugin
RPM_DEPENDS += chrpath libffi-devel rpm-build
# +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
EPEL_DEPENDS = libconfuse-devel epel-rpm-macros
ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
EPEL_DEPENDS += lcov
@@
-431,6
+435,9
@@
pkg-deb:
pkg-rpm: dist
make -C extras/rpm
pkg-rpm: dist
make -C extras/rpm
+pkg-srpm: dist
+ make -C extras/rpm srpm
+
dpdk-install-dev:
make -C dpdk install-$(PKG)
dpdk-install-dev:
make -C dpdk install-$(PKG)