X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=0ae1941ff83f8c2852bdec9b3597fe1c49541468;hb=da78c5abc;hp=0f0af4af0082121428b384223fd7a6f0e2d4affa;hpb=e263685ac82454c39eee6e2a2146dd1e02d61de8;p=vpp.git

diff --git a/Makefile b/Makefile
index 0f0af4af008..0ae1941ff83 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
 	RPM_DEPENDS += compat-openssl10 openssl-devel
 	RPM_DEPENDS += python2-devel python36-devel python3-ply
 	RPM_DEPENDS += python3-virtualenv python3-jsonschema
-	RPM_DEPENDS += cmake
+	RPM_DEPENDS += libarchive cmake
 	RPM_DEPENDS_GROUPS = 'Development Tools'
 else
 	RPM_DEPENDS += yum-utils
@@ -216,10 +216,10 @@ help:
 	@echo " featurelist          - dump feature list in markdown"
 	@echo " json-api-files       - (re)-generate json api files"
 	@echo " json-api-files-debug - (re)-generate json api files for debug target"
+	@echo " go-api-files         - (re)-generate golang api files"
 	@echo " docs                 - Build the Sphinx documentation"
 	@echo " docs-venv            - Build the virtual environment for the Sphinx docs"
 	@echo " docs-clean           - Remove the generated files from the Sphinx docs"
-	@echo " stats-fs-help        - Help to build the stats segment file system"
 	@echo ""
 	@echo "Make Arguments:"
 	@echo " V=[0|1]                  - set build verbosity level"
@@ -295,7 +295,7 @@ else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
 	@sudo -E dnf config-manager --set-enabled \
           $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1)
 	@sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
-	@sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS)
+	@sudo -E dnf install --skip-broken $(CONFIRM) $(RPM_DEPENDS)
 else ifeq ($(OS_ID),centos)
 	@sudo -E yum install $(CONFIRM) centos-release-scl-rh epel-release
 	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
@@ -336,7 +336,7 @@ dist:
 	      --format=tar \
 	      -o $(DIST_FILE) \
 	    HEAD ; \
-	    git describe > $(BR)/.version ; \
+	    git describe --long > $(BR)/.version ; \
 	else \
 	    (cd .. ; tar -cf $(DIST_FILE) $(DIST_SUBDIR) --exclude=*.tar) ; \
 	    src/scripts/version > $(BR)/.version ; \
@@ -361,7 +361,7 @@ wipedist:
 .PHONY: wipe
 wipe: wipedist test-wipe $(BR)/.deps.ok
 	$(call make,$(PLATFORM)_debug,$(addsuffix -wipe,$(TARGETS)))
-	@find . -type f -name "*.api.json" ! -path "./test/*" -exec rm {} \;
+	@find . -type f -name "*.api.json" ! -path "./src/*" -exec rm {} \;
 
 .PHONY: rebuild
 rebuild: wipe build
@@ -528,9 +528,7 @@ endef
 endif
 
 %.files: .FORCE
-	@find . \( -name '*\.[chyS]' -o -name '*\.java' -o -name '*\.lex' -o -name '*\.py' \) -and \
-		\( -not -path './build-root*' -o -path \
-		'./build-root/build-vpp_debug-native/dpdk*' \) > $@
+	@find src -name '*.[chS]' > $@
 
 .FORCE:
 
@@ -593,11 +591,6 @@ pkg-rpm: dist
 pkg-srpm: dist
 	make -C extras/rpm srpm
 
-.PHONY: dpdk-install-dev
-dpdk-install-dev:
-	$(call banner,"This command is deprecated. Please use 'make install-ext-deps'")
-	make -C build/external install-$(PKG)
-
 .PHONY: install-ext-deps
 install-ext-deps:
 	make -C build/external install-$(PKG)
@@ -613,6 +606,10 @@ json-api-files:
 json-api-files-debug:
 	$(WS_ROOT)/src/tools/vppapigen/generate_json.py --debug-target
 
+.PHONY: go-api-files
+go-api-files: json-api-files
+	$(WS_ROOT)/src/tools/vppapigen/generate_go.py
+
 .PHONY: ctags
 ctags: ctags.files
 	@ctags --totals --tag-relative=yes -L $<
@@ -630,7 +627,7 @@ cscope: cscope.files
 compdb:
 	@ninja -C build-root/build-vpp_debug-native/vpp build.ninja
 	@ninja -C build-root/build-vpp_debug-native/vpp -t compdb | \
-	  extras/scripts/compdb_cleanup.py > compile_commands.json
+	  src/scripts/compdb_cleanup.py > compile_commands.json
 
 .PHONY: checkstyle
 checkstyle: checkfeaturelist
@@ -665,38 +662,11 @@ endif
 
 .PHONY: featurelist
 featurelist: centos-pyyaml
-	@build-root/scripts/fts.py --all --markdown
+	@extras/scripts/fts.py --all --markdown
 
 .PHONY: checkfeaturelist
 checkfeaturelist: centos-pyyaml
-	@build-root/scripts/fts.py --validate --all
-
-
-# Build vpp_stats_fs
-
-.PHONY: stats-fs-install
-stats-fs-install:
-	@extras/vpp_stats_fs/install.sh install
-
-.PHONY: stats-fs-start
-stats-fs-start:
-	@extras/vpp_stats_fs/install.sh start
-
-.PHONY: stats-fs-cleanup
-stats-fs-cleanup:
-	@extras/vpp_stats_fs/install.sh cleanup
-
-.PHONY: stats-fs-help
-stats-fs-help:
-	@extras/vpp_stats_fs/install.sh help
-
-.PHONY: stats-fs-force-unmount
-stats-fs-force-unmount:
-	@extras/vpp_stats_fs/install.sh unmount
-
-.PHONY: stats-fs-stop
-stats-fs-stop:
-	@extras/vpp_stats_fs/install.sh stop
+	@extras/scripts/fts.py --validate --all
 
 #
 # Build the documentation