From fa6e7aacfcbb196251029560113fc4e9b2852518 Mon Sep 17 00:00:00 2001 From: Tianyu Li Date: Tue, 28 Sep 2021 13:00:16 +0800 Subject: 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 Change-Id: I9c4d91f97f2faa474bce28893ab763b414f759b8 --- extras/rpm/vpp.spec | 8 ++++---- 1 file 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 -- cgit 1.2.3-korg