NixOS configuration for HPC cluster https://docs.hpc.informatik.hs-fulda.de/
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

185 lines
4.7 KiB

2 years ago
  1. diff -r -u a/CMakeLists.txt b/CMakeLists.txt
  2. --- a/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  3. +++ b/CMakeLists.txt 2023-05-27 21:27:08.991487355 +0200
  4. @@ -85,10 +85,8 @@
  5. add_subdirectory("thirdparty/source/gtest")
  6. endif()
  7. -set(CMAKE_INSTALL_PREFIX "/")
  8. -
  9. -add_subdirectory("beeond")
  10. -add_subdirectory("beeond_thirdparty_gpl")
  11. +# add_subdirectory("beeond")
  12. +# add_subdirectory("beeond_thirdparty_gpl")
  13. # add_subdirectory("client_devel")
  14. # add_subdirectory("client_module")
  15. add_subdirectory("common")
  16. diff -r -u a/common/CMakeLists.txt b/common/CMakeLists.txt
  17. --- a/common/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  18. +++ b/common/CMakeLists.txt 2023-05-29 10:57:53.502540650 +0200
  19. @@ -572,6 +572,5 @@
  20. install(
  21. TARGETS beegfs_ib
  22. - DESTINATION "usr/lib"
  23. COMPONENT "libbeegfs-ib"
  24. )
  25. diff -r -u a/ctl/CMakeLists.txt b/ctl/CMakeLists.txt
  26. --- a/ctl/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  27. +++ b/ctl/CMakeLists.txt 2023-05-29 10:57:13.297068443 +0200
  28. @@ -149,6 +149,5 @@
  29. install(
  30. TARGETS beegfs-ctl
  31. - DESTINATION "usr/bin"
  32. COMPONENT "utils"
  33. )
  34. diff -r -u a/event_listener/CMakeLists.txt b/event_listener/CMakeLists.txt
  35. --- a/event_listener/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  36. +++ b/event_listener/CMakeLists.txt 2023-05-29 10:57:16.262103203 +0200
  37. @@ -10,13 +10,12 @@
  38. install(
  39. TARGETS beegfs-event-listener
  40. - DESTINATION "usr/sbin"
  41. COMPONENT "event-listener"
  42. )
  43. install(
  44. FILES "include/beegfs/beegfs_file_event_log.hpp"
  45. - DESTINATION "usr/include/beegfs"
  46. + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/beegfs"
  47. COMPONENT "event-listener"
  48. )
  49. Only in v7-7.3.3: foo
  50. diff -r -u a/fsck/CMakeLists.txt b/fsck/CMakeLists.txt
  51. --- a/fsck/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  52. +++ b/fsck/CMakeLists.txt 2023-05-29 10:57:18.938134583 +0200
  53. @@ -148,6 +148,5 @@
  54. install(
  55. TARGETS fsck.beegfs
  56. - DESTINATION "sbin"
  57. COMPONENT "utils"
  58. )
  59. diff -r -u a/helperd/CMakeLists.txt b/helperd/CMakeLists.txt
  60. --- a/helperd/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  61. +++ b/helperd/CMakeLists.txt 2023-05-29 10:57:21.185160939 +0200
  62. @@ -59,6 +59,5 @@
  63. install(
  64. TARGETS beegfs-helperd
  65. - DESTINATION "usr/sbin"
  66. COMPONENT "helperd"
  67. )
  68. diff -r -u a/meta/CMakeLists.txt b/meta/CMakeLists.txt
  69. --- a/meta/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  70. +++ b/meta/CMakeLists.txt 2023-05-29 11:00:36.501472258 +0200
  71. @@ -326,13 +326,12 @@
  72. install(
  73. TARGETS beegfs-meta
  74. - DESTINATION "usr/sbin"
  75. COMPONENT "meta"
  76. )
  77. install(
  78. PROGRAMS "build/dist/sbin/beegfs-setup-meta"
  79. - DESTINATION "usr/sbin"
  80. + TYPE BIN
  81. COMPONENT "meta"
  82. )
  83. @@ -347,10 +346,3 @@
  84. DESTINATION "etc/beegfs"
  85. COMPONENT "meta"
  86. )
  87. -
  88. -install(
  89. - PROGRAMS "build/beegfs-meta.sh"
  90. - RENAME "beegfs-meta"
  91. - DESTINATION "opt/beegfs/sbin"
  92. - COMPONENT "meta"
  93. -)
  94. diff -r -u a/mgmtd/CMakeLists.txt b/mgmtd/CMakeLists.txt
  95. --- a/mgmtd/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  96. +++ b/mgmtd/CMakeLists.txt 2023-05-29 11:00:44.428566811 +0200
  97. @@ -161,13 +161,12 @@
  98. install(
  99. TARGETS beegfs-mgmtd
  100. - DESTINATION "usr/sbin"
  101. COMPONENT "mgmtd"
  102. )
  103. install(
  104. PROGRAMS "build/dist/sbin/beegfs-setup-mgmtd"
  105. - DESTINATION "usr/sbin"
  106. + TYPE BIN
  107. COMPONENT "mgmtd"
  108. )
  109. @@ -182,10 +181,3 @@
  110. DESTINATION "etc/beegfs"
  111. COMPONENT "mgmtd"
  112. )
  113. -
  114. -install(
  115. - PROGRAMS "build/beegfs-mgmtd.sh"
  116. - RENAME "beegfs-mgmtd"
  117. - DESTINATION "opt/beegfs/sbin"
  118. - COMPONENT "mgmtd"
  119. -)
  120. diff -r -u a/storage/CMakeLists.txt b/storage/CMakeLists.txt
  121. --- a/storage/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  122. +++ b/storage/CMakeLists.txt 2023-05-29 11:00:53.385673711 +0200
  123. @@ -188,7 +188,6 @@
  124. install(
  125. TARGETS beegfs-storage
  126. - DESTINATION "usr/sbin"
  127. COMPONENT "storage"
  128. )
  129. @@ -200,7 +199,7 @@
  130. install(
  131. PROGRAMS "build/dist/sbin/beegfs-setup-storage"
  132. - DESTINATION "usr/sbin"
  133. + TYPE BIN
  134. COMPONENT "storage"
  135. )
  136. @@ -209,10 +208,3 @@
  137. DESTINATION "etc/beegfs"
  138. COMPONENT "storage"
  139. )
  140. -
  141. -install(
  142. - PROGRAMS "build/beegfs-storage.sh"
  143. - RENAME "beegfs-storage"
  144. - DESTINATION "opt/beegfs/sbin"
  145. - COMPONENT "storage"
  146. -)
  147. diff -r -u a/upgrade/beegfs_mirror_md/CMakeLists.txt b/upgrade/beegfs_mirror_md/CMakeLists.txt
  148. --- a/upgrade/beegfs_mirror_md/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  149. +++ b/upgrade/beegfs_mirror_md/CMakeLists.txt 2023-05-29 10:57:40.926392744 +0200
  150. @@ -15,6 +15,5 @@
  151. install(
  152. TARGETS "beegfs-mirror-md"
  153. - DESTINATION "usr/sbin"
  154. COMPONENT "beegfs-mirror-md"
  155. )
  156. diff -r -u a/utils/CMakeLists.txt b/utils/CMakeLists.txt
  157. --- a/utils/CMakeLists.txt 2023-03-15 12:09:15.000000000 +0100
  158. +++ b/utils/CMakeLists.txt 2023-05-29 11:01:05.123813896 +0200
  159. @@ -6,6 +6,6 @@
  160. install(
  161. PROGRAMS "scripts/beegfs-check-servers" "scripts/beegfs-df" "scripts/beegfs-net"
  162. - DESTINATION "usr/bin"
  163. + TYPE BIN
  164. COMPONENT "utils"
  165. )