From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 14 Sep 2016 23:58:33 +0000 (-0700)
Subject: Fix vpp-plugins rpms
X-Git-Tag: v17.01-rc0~2
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F76%2F3676%2F2;p=vpp.git

Fix vpp-plugins rpms

vpp by default looks in /usr/lib/vpp_plugins
rpmbuild has ${_libdir} as /usr/lib64

Thus vpp doesn't see the plugins.

Change-Id: Iecbc491940678728305c181b04bb0914ad174bf1
Signed-off-by: Ed Warnicke <eaw@cisco.com>
(cherry picked from commit 2dfd08242d66fb79c9a861c6a0c7fee45ef6bc60)
---

diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index af4d70727c0..8c4f4f05e15 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -154,18 +154,18 @@ done
 #
 # vpp-plugins
 # 
-mkdir -p -m755 %{buildroot}%{_libdir}/vpp_plugins
-mkdir -p -m755 %{buildroot}%{_libdir}/vpp_api_test_plugins
+mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins
+mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins
 for file in $(cd %{_vpp_install_dir}/plugins/lib64/vpp_plugins && find -type f -print)
 do
         install -p -m 644 %{_vpp_install_dir}/plugins/lib64/vpp_plugins/$file \
-           %{buildroot}%{_libdir}/vpp_plugins/$file
+           %{buildroot}/usr/lib/vpp_plugins/$file
 done
 
 for file in $(cd %{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins && find -type f -print)
 do
         install -p -m 644 %{_vpp_install_dir}/plugins/lib64/vpp_api_test_plugins/$file \
-           %{buildroot}%{_libdir}/vpp_api_test_plugins/$file
+           %{buildroot}/usr/lib/vpp_api_test_plugins/$file
 done
 
 %post
@@ -226,5 +226,5 @@ fi
 
 %files plugins
 %defattr(-,bin,bin)
-%{_libdir}/vpp_plugins/*
-%{_libdir}/vpp_api_test_plugins/*
+/usr/lib/vpp_plugins/*
+/usr/lib/vpp_api_test_plugins/*