From a838dad659f0f819201dce948cdff5fa26b6620b Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 13 Jun 2014 19:55:59 +0200 Subject: [PATCH] RPMs: Do not install the agent parts refs #6481 --- icinga2.spec | 4 ---- tools/CMakeLists.txt | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index 4989d79d9..96a9736e0 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -437,10 +437,6 @@ exit 0 %{_bindir}/%{name}-sign-key %{_sbindir}/%{name}-enable-feature %{_sbindir}/%{name}-disable-feature -%{_sbindir}/%{name}-setup-agent -%{_sbindir}/%{name}-discover-agent -%{_sbindir}/%{name}-forget-agent -%{_sbindir}/%{name}-list-agents %exclude %{_libdir}/%{name}/libdb_ido_mysql* %exclude %{_libdir}/%{name}/libdb_ido_pgsql* %{_libdir}/%{name} diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 201400d0d..2eb48188e 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -24,13 +24,6 @@ if(UNIX OR CYGWIN) configure_file(icinga2-forget-agent.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-forget-agent @ONLY) configure_file(icinga2-list-agents.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-list-agents @ONLY) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/icinga2-enable-feature ${CMAKE_CURRENT_BINARY_DIR}/icinga2-discover-agent - ${CMAKE_CURRENT_BINARY_DIR}/icinga2-forget-agent ${CMAKE_CURRENT_BINARY_DIR}/icinga2-list-agents - DESTINATION ${CMAKE_INSTALL_SBINDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) - install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ./icinga2-enable-feature \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SBINDIR}/icinga2-disable-feature\")") endif() @@ -41,8 +34,4 @@ if(MSVC) TYPE FAE04EC0-301F-11D3-BF4B-00C04F79EFBC ) - install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/icinga2-setup-agent/bin/\${CMAKE_INSTALL_CONFIG_NAME}/Icinga2SetupAgent.exe - DESTINATION ${CMAKE_INSTALL_SBINDIR} - ) endif()