X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fplatforms.mk;h=7904cc40b5cdd21561feb17bfac64751e36b6b98;hb=3288ed7234ad9b6d59d249f48dd1a2d06168bfd5;hp=6f21b6dc6bf69f6b37862f51f79e57b46342c3d4;hpb=cb034b9b374927c7552e36dcbc306d8456b2a0cb;p=vpp.git

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 6f21b6dc6bf..7904cc40b5c 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -59,14 +59,6 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	./scripts/find-vpp-api-java-contents $(INSTALL_PREFIX)$(ARCH)	\
 	 deb/debian/vpp-api-java.install ;				\
 									\
-	: vpp-api-python package ;					\
-	./scripts/find-vpp-api-python-contents $(INSTALL_PREFIX)$(ARCH)	\
-	 deb/debian/vpp-api-python.install ;				\
-									\
-	: dpdk headers ;						\
-	./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH)		\
-	 deb/debian/vpp-dpdk-dev.install ;				\
-									\
 	: bin package needs startup config ; 				\
 	echo ../../src/vpp/conf/startup.conf /etc/vpp 			\
 	   >> deb/debian/vpp.install ;					\
@@ -75,8 +67,16 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	echo ../../src/vpp/conf/80-vpp.conf /etc/sysctl.d 		\
 	   >> deb/debian/vpp.install ;					\
 									\
+	: bash completion for vppctl ;					\
+	echo ../../src/scripts/vppctl_completion /etc/bash_completion.d	\
+	   >> deb/debian/vpp.install ;					\
+									\
+	: move dictionary of vppctl commands ;				\
+	echo ../../src/scripts/vppctl-cmd-list /usr/share/vpp		\
+	   >> deb/debian/vpp.install ;					\
+									\
 	: dev package needs a couple of additions ;			\
-	echo ../build-tool-native/tools/vppapigen /usr/bin		\
+	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/bin/vppapigen /usr/bin	\
 	   >> deb/debian/vpp-dev.install ;				\
 	echo ../../src/vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin	\
 	   >> deb/debian/vpp-dev.install ;				\
@@ -94,20 +94,3 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	dpkg-buildpackage -us -uc -b					\
 	)
 
-.PHONY: install-rpm
-install-rpm: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
-	@$(BUILD_ENV) ;							\
-	set -eu$(BUILD_DEBUG) ;						\
-	$(MAKE) -C $(MU_BUILD_ROOT_DIR)					\
-	    $(patsubst %,%-install,					\
-	      $(ROOT_PACKAGES))	|| exit 1;				\
-									\
-	cd rpm ;							\
-	mkdir -p SOURCES ;                                              \
-	if test -f *.tar.gz ; then mv *.tar.gz SOURCES ; fi ;           \
-	rpmbuild -bb --define "_topdir $$PWD" --define			\
-		"_install_dir $(INSTALL_PREFIX)$(ARCH)"                 \
-		--define "_mu_build_root_dir $(MU_BUILD_ROOT_DIR)"      \
-		vpp.spec ;                                              \
-	mv $$(find RPMS -name \*.rpm -type f) ..
-