summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Warnicke <eaw@cisco.com>2016-09-14 16:58:33 -0700
committerEd Warnicke <eaw@cisco.com>2016-09-14 17:31:17 -0700
commit2dfd08242d66fb79c9a861c6a0c7fee45ef6bc60 (patch)
tree05852f959038fcafc3c432415b09e6c336a8a928
parentbcc0cf613754e5eaff56c29e6554550370cb6b91 (diff)
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>
-rw-r--r--build-root/rpm/vpp.spec12
1 files changed, 6 insertions, 6 deletions
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 96e6f0fd66a..adf9e38f757 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -126,18 +126,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
@@ -172,5 +172,5 @@ sysctl --system
%files plugins
%defattr(-,bin,bin)
-%{_libdir}/vpp_plugins/*
-%{_libdir}/vpp_api_test_plugins/*
+/usr/lib/vpp_plugins/*
+/usr/lib/vpp_api_test_plugins/*