X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fplatforms.mk;h=a568c7a06a3344d3971e6c2da60c3775d6862bfb;hb=296b20162affd0b3bb4168ced045fe7bcb15b03b;hp=8a18ec14d5cf93c349c9ad00464d5e80156a3999;hpb=1c11311b322ecf0b4bc88949f394922e9940ebb0;p=vpp.git

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 8a18ec14d5c..a568c7a06a3 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -28,16 +28,33 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	  | sed -e 's:.*:../& /usr/bin:'				\
 	    > 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:'		\
 	    > 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 ;					\
 									\
+	: plugins package ;						\
+	./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 ;				\
+									\
 	: dpdk headers ;						\
 	./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH)		\
 	 deb/debian/vpp-dpdk-dev.install ;				\
@@ -51,8 +68,14 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	   >> deb/debian/vpp.install ;					\
 									\
 	: dev package needs a couple of additions ;			\
-        echo ../build-tool-native/vppapigen/vppapigen /usr/bin		\
-           >> deb/debian/vpp-dev.install ;				\
+	echo ../build-tool-native/vppapigen/vppapigen /usr/bin		\
+	   >> deb/debian/vpp-dev.install ;				\
+	echo ../../vpp-api/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	\
+	   echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen	\
+	       >> deb/debian/vpp-dev.install;				\
+	done;								\
 									\
 	: generate changelog;						\
 	./scripts/generate-deb-changelog 				\
@@ -72,6 +95,11 @@ install-rpm: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	      $(ROOT_PACKAGES))	|| exit 1;				\
 									\
 	cd rpm ;							\
-	rpmbuild -bb --define "_topdir $$PWD"  vpp.spec ; 		\
+	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) ..