summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorTianyu Li <tianyu.li@arm.com>2021-09-28 13:00:16 +0800
committerTianyu Li <tianyu.li@arm.com>2021-10-08 11:15:51 +0800
commitfa6e7aacfcbb196251029560113fc4e9b2852518 (patch)
tree175689b4c78c99e4b25c373b7b9695c21b042bf4 /extras
parentac55a722d67c7354f2ab877ff79309027f7ac3ca (diff)
build: fix centos rpm build
When build vpp-plugins rpm package, found /home/vpp/build-root/rpmbuild/vpp-21.10/build-root/\ install-vpp-native/vpp/lib/vpp_plugins: No such file or directory RPM build errors: File not found: /home/vpp/build-root/rpmbuild/../usr/lib/vpp_plugins/* After e3cf4d0 ("build: use GNUInstallDirs install destinations") vpp_plugins on centos src path changed from lib to lib64 Update RPM spec file accordingly. Type: fix Signed-off-by: Tianyu Li <tianyu.li@arm.com> Change-Id: I9c4d91f97f2faa474bce28893ab763b414f759b8
Diffstat (limited to 'extras')
-rw-r--r--extras/rpm/vpp.spec8
1 files changed, 4 insertions, 4 deletions
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 9d798056ee5..ac5c93295c4 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -276,15 +276,15 @@ mkdir -p -m755 %{buildroot}%{_localstatedir}/log/vpp
#
mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins
mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_plugins && find -type f -print)
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/%{_lib}/vpp_plugins && find -type f -print)
do
- install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_plugins/$file \
+ install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/%{_lib}/vpp_plugins/$file \
%{buildroot}/usr/lib/vpp_plugins/$file
done
-for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_api_test_plugins && find -type f -print)
+for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/%{_lib}/vpp_api_test_plugins && find -type f -print)
do
- install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_api_test_plugins/$file \
+ install -p -m 755 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/%{_lib}/vpp_api_test_plugins/$file \
%{buildroot}/usr/lib/vpp_api_test_plugins/$file
done