0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch 2.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From 696b6be8a623f4466def2a161baa26094e5592a4 Mon Sep 17 00:00:00 2001
  2. From: Michal Vasko <mvasko@cesnet.cz>
  3. Date: Wed, 18 May 2022 09:14:35 +0200
  4. Subject: [PATCH] build BUGFIX use DESTDIR when executing scripts
  5. Fixes #1217
  6. [Upstream accepted 696b6be8a623f4466def2a161baa26094e5592a4]
  7. Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
  8. ---
  9. CMakeLists.txt | 6 +++---
  10. 1 file changed, 3 insertions(+), 3 deletions(-)
  11. diff --git a/CMakeLists.txt b/CMakeLists.txt
  12. index efe922d..60e3150 100644
  13. --- a/CMakeLists.txt
  14. +++ b/CMakeLists.txt
  15. @@ -351,7 +351,7 @@ if(INSTALL_MODULES)
  16. set(ENV{NP2_MODULE_GROUP} \"${MODULES_GROUP}\")
  17. set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\")
  18. set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\")
  19. - execute_process(COMMAND \"${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES)
  20. + execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES)
  21. if(NOT SETUP_RES EQUAL \"0\")
  22. message(FATAL_ERROR \" scripts/setup.sh failed: \${SETUP_RES}\")
  23. endif()
  24. @@ -364,7 +364,7 @@ if(GENERATE_HOSTKEY)
  25. message(STATUS \"Generating a new RSA host key \\\"genkey\\\" if not already added...\")
  26. set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\")
  27. set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\")
  28. - execute_process(COMMAND ${SCRIPT_DIR}/merge_hostkey.sh RESULT_VARIABLE MERGE_HOSTKEY_RES)
  29. + execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_hostkey.sh\" RESULT_VARIABLE MERGE_HOSTKEY_RES)
  30. if(NOT MERGE_HOSTKEY_RES EQUAL \"0\")
  31. message(FATAL_ERROR \" scripts/merge_hostkey.sh failed: \${MERGE_HOSTKEY_RES}\")
  32. endif()
  33. @@ -375,7 +375,7 @@ if(MERGE_LISTEN_CONFIG)
  34. message(STATUS \"Merging default server listen configuration if there is none...\")
  35. set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\")
  36. set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\")
  37. - execute_process(COMMAND ${SCRIPT_DIR}/merge_config.sh RESULT_VARIABLE MERGE_CONFIG_RES)
  38. + execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_config.sh\" RESULT_VARIABLE MERGE_CONFIG_RES)
  39. if(NOT MERGE_CONFIG_RES EQUAL \"0\")
  40. message(FATAL_ERROR \" scripts/merge_config.sh failed: \${MERGE_CONFIG_RES}\")
  41. endif()
  42. --
  43. 2.30.2