ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vpp-plugins rpms

Browse Source 
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)
This commit is contained in:
Ed Warnicke
2016-09-14 16:58:33 -07:00
committed by Damjan Marion
parent 74e2efad55
commit e7637e7017
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build-root/rpm/vpp.spec
View File

@ -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/*