X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fplatforms.mk;h=a8bd44ee15b9ff7413ae5e5df251cf86dc773c4d;hb=cc4a5e8089967f0c266e9c5ed319c38c111004cd;hp=111a45dcd7a24612c049cf512b9842e439d29a77;hpb=d995c757f05f78aa759b0a65c0a7e38088e690a9;p=vpp.git

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 111a45dcd7a..a8bd44ee15b 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -36,7 +36,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	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 ;					\
@@ -59,34 +59,34 @@ 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 ;					\
 									\
 	: and sysctl config ; 						\
 	echo ../../src/vpp/conf/80-vpp.conf /etc/sysctl.d 		\
-	   >> deb/debian/vpp.install ;				        \
+	   >> deb/debian/vpp.install ;					\
 									\
-	: bash completion for vppctl ;                                  \
-	echo ../../src/scripts/vppctl_completion /etc/bash_completion.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 ../docs/siphon_docs/clicmd.itemlist /usr/share/vpp		\
+	echo ../../src/scripts/vppctl-cmd-list /usr/share/vpp		\
 	   >> deb/debian/vpp.install ;					\
 									\
+	: add log directory ;						\
+	echo /var/log/vpp/						\
+	   >> deb/debian/vpp.dirs ;					\
+									\
 	: dev package needs a couple of additions ;			\
 	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	\
+	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 ../../extras/japi/java/jvpp/gen/jvpp_gen.py /usr/bin	\
 	   >> deb/debian/vpp-dev.install ;				\
 	for i in $$(ls ../src/vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
 	   echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen	\
@@ -102,20 +102,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) ..
-