diff options
Diffstat (limited to 'build-root')
| -rw-r--r-- | build-root/Makefile | 3 | ||||
| -rw-r--r-- | build-root/rpm/vpp.spec | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/build-root/Makefile b/build-root/Makefile index 9fe03d66244..6e26e90e4dd 100644 --- a/build-root/Makefile +++ b/build-root/Makefile @@ -1141,8 +1141,7 @@ package_wipe_script = \ @message=$(if $(is_build_tool),"Wiping build $(PACKAGE)","Wiping build/install $(PACKAGE)") ; \ $(call build_msg_fn,$$message) ; \ $(BUILD_ENV) ; \ - rm -rf $(if $(is_build_tool),$(PACKAGE_BUILD_DIR),$(PACKAGE_INSTALL_DIR) $(PACKAGE_BUILD_DIR)); \ - rm -f $(MU_BUILD_ROOT_DIR)/docs/siphon_docs/clicmd.itemlist + rm -rf $(if $(is_build_tool),$(PACKAGE_BUILD_DIR),$(PACKAGE_INSTALL_DIR) $(PACKAGE_BUILD_DIR)) .PHONY: %-wipe %-wipe: diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec index 07ea2c34a9c..c3c0d927b10 100644 --- a/build-root/rpm/vpp.spec +++ b/build-root/rpm/vpp.spec @@ -129,8 +129,6 @@ install -p -m 644 %{_mu_build_dir}/../src/vpp/conf/80-vpp.conf %{buildroot}/etc/ # libraries # mkdir -p -m755 %{buildroot}%{_libdir} -mkdir -p -m755 %{buildroot}/usr/share/vpp -mkdir -p -m755 %{buildroot}/etc/bash_completion.d for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/*/lib* -type f -name '*.so.*.*.*' -print ) do install -p -m 755 $file %{buildroot}%{_libdir} @@ -147,8 +145,6 @@ for file in $(find %{_mu_build_dir}/%{_vpp_install_dir}/vpp/share/vpp/api -type do install -p -m 644 $file %{buildroot}/usr/share/vpp/api done -install -p -m 644 %{_mu_build_dir}/../src/scripts/vppctl_completion %{buildroot}/etc/bash_completion.d -install -p -m 644 %{_mu_build_dir}/docs/siphon_docs/clicmd.itemlist %{buildroot}/usr/share/vpp # Lua bindings mkdir -p -m755 %{buildroot}/usr/share/doc/vpp/examples/lua/examples/cli @@ -277,8 +273,6 @@ fi %exclude %{_libdir}/vpp_api_test_plugins %{_libdir}/* /usr/share/vpp/api/* -/etc/bash_completion.d/vppctl_completion -/usr/share/vpp/clicmd.itemlist %files api-lua %defattr(644,root,root) |