VPP-355: add PBB (802.1ah) tag rewrite

[vpp.git] / build-data / platforms.mk

diff --git a/build-data/platforms.mk b/build-data/platforms.mk
index 8a18ec1..59c2809 100644 (file)
--- a/build-data/platforms.mk
+++ b/build-data/platforms.mk
@@ -31,6 +31,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
        : 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 ;                              \
                                                                        \
@@ -38,6 +39,10 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
        ./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 ;                               \
+                                                                       \
        : dpdk headers ;                                                \
        ./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH)           \
         deb/debian/vpp-dpdk-dev.install ;                              \
@@ -47,12 +52,20 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
           >> deb/debian/vpp.install ;                                  \
                                                                        \
        : and sysctl config ;                                           \
-       echo ../../vpp/conf/80-vpp.conf /etc/sysctl.d                   \
+       echo ../../vpp/conf/80-vpp.conf /usr/lib/sysctl.d               \
           >> deb/debian/vpp.install ;                                  \
                                                                        \
        : dev package needs a couple of additions ;                     \
-        echo ../build-tool-native/vppapigen/vppapigen /usr/bin         \
+       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       \
+          echo ../$${i} /usr/lib/python2.7/dist-packages/jvppgen       \
+              >> deb/debian/vpp-dev.install;                           \
+       done;                                                           \
                                                                        \
        : generate changelog;                                           \
        ./scripts/generate-deb-changelog                                \
@@ -72,6 +85,7 @@ install-rpm: $(patsubst %,%-find-source,$(ROOT_PACKAGES))
              $(ROOT_PACKAGES)) || exit 1;                              \
                                                                        \
        cd rpm ;                                                        \
-       rpmbuild -bb --define "_topdir $$PWD"  vpp.spec ;               \
+       rpmbuild -bb --define "_topdir $$PWD" --define                  \
+               "_install_dir $(INSTALL_PREFIX)$(ARCH)" vpp.spec ;      \
        mv $$(find RPMS -name \*.rpm -type f) ..