diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-09-14 16:58:33 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2016-11-03 16:42:26 +0000 |
| commit | e7637e701717f24172cdbdbf89ba71bdef5125de (patch) | |
| tree | 2a8f85da1201af7ab2924200a43050fd9aa6cce2 /build-root | |
| parent | 74e2efad55da7a49440e1486205084fadaaf64e0 (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>
(cherry picked from commit 2dfd08242d66fb79c9a861c6a0c7fee45ef6bc60)
Diffstat (limited to 'build-root')
| -rw-r--r-- | build-root/rpm/vpp.spec | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec index af4d7072..8c4f4f05 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/* |