summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Cmarada <mcmarada@cisco.com>2019-02-12 19:03:28 +0100
committerMichal Cmarada <mcmarada@cisco.com>2019-02-12 18:08:08 +0000
commite0719020618edb3c9276213c256dcf65ecad6a91 (patch)
tree6c7e71645cd87ba7655a242a43093d97cf050487
parentc21d38f80d5bc5415bc5cf58f97779e542c924c9 (diff)
update requirements
- fix typo - cleanup Change-Id: Icb2403bf0a2542d31584cc2c7ffe8b725454de08 Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
-rw-r--r--Requirements/Makefile (renamed from Requierements/Makefile)80
1 files changed, 4 insertions, 76 deletions
diff --git a/Requierements/Makefile b/Requirements/Makefile
index 6be83fd..7cb01b7 100644
--- a/Requierements/Makefile
+++ b/Requirements/Makefile
@@ -14,34 +14,12 @@
export WS_ROOT=$(CURDIR)
export BR=$(WS_ROOT)/build-root
CCACHE_DIR?=$(BR)/.ccache
-GDB?=gdb
-PLATFORM?=vpp
-SAMPLE_PLUGIN?=no
+PLATFORM?=jvpp
STARTUP_DIR?=$(PWD)
MACHINE=$(shell uname -m)
SUDO?=sudo
,:=,
-define disable_plugins
-$(if $(1), \
- "plugins {" \
- $(patsubst %,"plugin %_plugin.so { disable }",$(subst $(,), ,$(1))) \
- " }" \
- ,)
-endef
-
-MINIMAL_STARTUP_CONF=" \
-unix { \
- interactive \
- cli-listen /run/vpp/cli.sock \
- gid $(shell id -g) \
- $(if $(wildcard startup.vpp),"exec startup.vpp",) \
-} \
-$(if $(DPDK_CONFIG), "dpdk { $(DPDK_CONFIG) }",) \
-$(call disable_plugins,$(DISABLED_PLUGINS)) \
-"
-
-GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
#
# OS Detection
@@ -167,56 +145,18 @@ CONFIRM=-y
FORCE=--force-yes
endif
-TARGETS = vpp
+TARGETS = jvpp
-ifneq ($(SAMPLE_PLUGIN),no)
-TARGETS += sample-plugin
-endif
-.PHONY: help wipe wipe-release build build-release rebuild rebuild-release
-.PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
-.PHONY: ctags cscope
-.PHONY: test test-debug retest retest-debug test-doc test-wipe-doc test-help test-wipe
-.PHONY: test-cov test-wipe-cov
+.PHONY: help
+.PHONY: install-dep
-define banner
- @echo "========================================================================"
- @echo " $(1)"
- @echo "========================================================================"
- @echo " "
-endef
help:
@echo "Make Targets:"
@echo " install-dep - install software dependencies"
@echo ""
-$(BR)/.deps.ok:
-ifeq ($(findstring y,$(UNATTENDED)),y)
- make install-dep
-endif
-ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
- @MISSING=$$(apt-get install -y -qq -s $(DEB_DEPENDS) | grep "^Inst ") ; \
- if [ -n "$$MISSING" ] ; then \
- echo "\nPlease install missing packages: \n$$MISSING\n" ; \
- echo "by executing \"make install-dep\"\n" ; \
- exit 1 ; \
- fi ; \
- exit 0
-else ifneq ("$(wildcard /etc/redhat-release)","")
- @for i in $(RPM_DEPENDS) ; do \
- RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3) ; \
- MISSING+=$$(rpm -q $$RPM | grep "^package") ; \
- done ; \
- if [ -n "$$MISSING" ] ; then \
- echo "Please install missing RPMs: \n$$MISSING\n" ; \
- echo "by executing \"make install-dep\"\n" ; \
- exit 1 ; \
- fi ; \
- exit 0
-endif
- @touch $@
-
install-dep:
ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
ifeq ($(OS_VERSION_ID),14.04)
@@ -254,15 +194,3 @@ endif
define make
@make -C $(BR) PLATFORM=$(PLATFORM) TAG=$(1) $(2)
endef
-
-$(BR)/scripts/.version:
-ifneq ("$(wildcard /etc/redhat-release)","")
- $(shell $(BR)/scripts/version rpm-string > $(BR)/scripts/.version)
-else
- $(shell $(BR)/scripts/version > $(BR)/scripts/.version)
-endif
-
-DIST_FILE = $(BR)/vpp-$(shell src/scripts/version).tar
-DIST_SUBDIR = vpp-$(shell src/scripts/version|cut -f1 -d-)
-
-