X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-data%2Fplatforms.mk;h=a568c7a06a3344d3971e6c2da60c3775d6862bfb;hb=refs%2Fchanges%2F51%2F4151%2F4;hp=9d87815177f60720bc09e8b9f5191abf07ed5a30;hpb=6ce685d79b1365588a92340e5c45cdbdea92d5db;p=vpp.git

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 9d87815177f..a568c7a06a3 100644
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -28,6 +28,10 @@ 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\.*\.*\.*'				\
@@ -35,6 +39,10 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	  | 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 ;					\
@@ -62,8 +70,6 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	: dev package needs a couple of additions ;			\
 	echo ../build-tool-native/vppapigen/vppapigen /usr/bin		\
 	   >> 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		\
 	   >> deb/debian/vpp-dev.install ;				\
 	for i in $$(ls ../vpp-api/java/jvpp/gen/jvppgen/*.py); do	\
@@ -89,7 +95,11 @@ install-rpm: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
 	      $(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)" vpp.spec ;	\
+		"_install_dir $(INSTALL_PREFIX)$(ARCH)"                 \
+		--define "_mu_build_root_dir $(MU_BUILD_ROOT_DIR)"      \
+		vpp.spec ;                                              \
 	mv $$(find RPMS -name \*.rpm -type f) ..