X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fplatforms.mk;h=fafddc64a0dd84946c53ba47a594d4dbfa1b2b24;hb=eb1525f1060569cc3dc03aca7696ce05e1401a09;hp=16e61e3f641df4d414d60ef9b53d10d9a28db2f5;hpb=20a29c7b4d1b5b68112498bee21ee7f3fe123b13;p=vpp.git

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 16e61e3f641..fafddc64a0d 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -25,16 +25,24 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 									\
 	: generate file manifests ;					\
 	find $(INSTALL_PREFIX)$(ARCH)/*/bin -type f -print		\
-	  | sed -e 's:.*:../& /usr/bin:'				\
+	  | sed -e 's:.*:../& /usr/bin:' | grep -v vppapigen		\
 	    > deb/debian/vpp.install ;					\
 									\
+	: core api definitions ;					\
+	./scripts/find-api-core-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp.install ;					\
+									\
 	: need symbolic links in the lib pkg ; 				\
 	find $(INSTALL_PREFIX)$(ARCH)/*/lib* \( -type f -o  -type l \)  \
 	  -print | egrep -e '*\.so\.*\.*\.*'				\
 	  | grep -v plugins\/						\
-	  | sed -e 's:.*:../& /usr/lib/x86_64-linux-gnu:'		\
+	  | sed -e 's:.*:../& /usr/lib/$(MACHINE)-linux-gnu:'		\
 	    > deb/debian/vpp-lib.install ;				\
 									\
+	: vnet api definitions ;					\
+	./scripts/find-api-lib-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp-lib.install ;					\
+									\
 	: dev package ;							\
 	./scripts/find-dev-contents $(INSTALL_PREFIX)$(ARCH)		\
 	 deb/debian/vpp-dev.install ;					\
@@ -43,30 +51,40 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	./scripts/find-plugins-contents $(INSTALL_PREFIX)$(ARCH)	\
 	 deb/debian/vpp-plugins.install ;				\
 									\
-	: python-api package ;						\
-	./scripts/find-python-api-contents $(INSTALL_PREFIX)$(ARCH)	\
-	 deb/debian/vpp-python-api.install ;				\
+	: vpp-api-lua package ;						\
+	./scripts/find-vpp-api-lua-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp-api-lua.install ;				\
 									\
-	: dpdk headers ;						\
-	./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH)		\
-	 deb/debian/vpp-dpdk-dev.install ;				\
+	: vpp-api-java package ;					\
+	./scripts/find-vpp-api-java-contents $(INSTALL_PREFIX)$(ARCH)	\
+	 deb/debian/vpp-api-java.install ;				\
 									\
 	: bin package needs startup config ; 				\
-	echo ../../vpp/conf/startup.conf /etc/vpp 			\
+	echo ../../src/vpp/conf/startup.conf /etc/vpp 			\
 	   >> deb/debian/vpp.install ;					\
 									\
 	: and sysctl config ; 						\
-	echo ../../vpp/conf/80-vpp.conf /etc/sysctl.d 			\
+	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 ;					\
 									\
+	: add log directory ;						\
+	echo /var/log/vpp/						\
+	   >> deb/debian/vpp.dirs ;					\
+									\
 	: dev package needs a couple of additions ;			\
-	echo ../build-tool-native/vppapigen/vppapigen /usr/bin		\
+	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/bin/vppapigen /usr/bin	\
+	   >> deb/debian/vpp-dev.install ;				\
+	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/C.py /usr/share/vpp  \
+	   >> deb/debian/vpp-dev.install ;				\
+	echo ../$(INSTALL_PREFIX)$(ARCH)/vpp/share/vpp/JSON.py /usr/share/vpp \
 	   >> deb/debian/vpp-dev.install ;				\
-	echo ../../vppapigen/pyvppapigen.py /usr/bin			\
-           >> deb/debian/vpp-dev.install ;				\
-	echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin		\
+	echo ../../extras/japi/java/jvpp/gen/jvpp_gen.py /usr/bin	\
 	   >> deb/debian/vpp-dev.install ;				\
-	for i in $$(ls ../vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
+	for i in $$(ls ../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
 	   echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen	\
 	       >> deb/debian/vpp-dev.install;				\
 	done;								\
@@ -80,20 +98,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) ..
-