Merge branch 'revert-5863e6ae' into 'master'

Revert "Merge branch 'jathenst/328-update-capstone-to-5-0-0' into 'master'"

This reverts merge request !215

See merge request !217

CHANGELOG.md

@@ -8,6 +8,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 ### New
 ### Changed
+- Unify dependency scripts (dl and compile): Unify `-d` and `-p` flags ([!174](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/174)).
 - Support for `close_range` syscall. ([!201](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/201)).
   - Removal of `O_PATH` check in `gkfs_open`, allows cp with asterisk. This is for newer kernels.
   - Support to print newer syscall (although not implemented). Added syscall number to log for easy capture missing ones.
@@ -15,7 +16,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Increased merge assert for files with size 0, specific for DLIO with GekkoFS in Debug ([!208])(https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/208)).
 - Added code to correct fork issues. `pthread_at_fork` cleans and starts GekkoFS ([!210](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/210)).
 - Updated mochi to solve ucx corruption issues ([!211])(https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/211)).
-- Update capstone to version 5.0.5 ([!215](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/215)).
 ### Fixed
 
 ## [0.9.3] - 2024-07

scripts/profiles/0.9.4/agios.specs

@@ -38,7 +38,7 @@ comment="All dependencies (except transport-specific and experimental)"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"

scripts/profiles/0.9.4/arm.specs

@@ -38,7 +38,7 @@ comment="Dependencies for PowerPC supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"

scripts/profiles/0.9.4/default.specs

@@ -38,7 +38,7 @@ comment="All dependencies"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"

scripts/profiles/0.9.4/default_zmq.specs

@@ -38,7 +38,7 @@ comment="All dependencies"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"

scripts/profiles/0.9.4/infiniband_verbs.specs

@@ -38,7 +38,7 @@ comment="Dependencies for Infiniband supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"

scripts/profiles/0.9.4/install/capstone.install

@@ -48,7 +48,7 @@ pkg_install() {
     CURR="${SOURCE_DIR}/${ID}"
     prepare_build_dir "${CURR}"
     cd "${CURR}/build"
-    ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS=ON ..
+    ${CMAKE} -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release ..
     make -j"${CORES}" install
 }
 

scripts/profiles/0.9.4/install/syscall_intercept.install

@@ -48,16 +48,11 @@ pkg_install() {
     CURR="${SOURCE_DIR}/${ID}"
     EXTRA_INSTALL_ARGS="${PROFILE_EXTRA_INSTALL_ARGS[${ID}]}"
     prepare_build_dir "${CURR}"
-
-    # patch path for new capstone 5.0.5 include location
-    sed -i 's/\#include <capstone.h>/\#include <capstone\/capstone.h>/g' \
-      ${CURR}/src/capstone_wrapper.h
-
     if [[ ${EXTRA_INSTALL_ARGS} == "ARM64" ]]; then
         cd "${CURR}"/arch/aarch64/
         mkdir -p build
         cd build
-    else
+    else    
         cd "${CURR}"/build
     fi
     $CMAKE -DCMAKE_PREFIX_PATH="${INSTALL_DIR}" \

scripts/profiles/0.9.4/marenostrum4.specs

@@ -38,7 +38,7 @@ comment="Dependencies for Marenostrum 4 supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"

scripts/profiles/0.9.4/mogon2.specs

@@ -38,7 +38,7 @@ comment="Dependencies for Mogon 2 supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.1"
     ["rocksdb"]="8.10.0"
     ["psm2"]="11.2.185"

scripts/profiles/0.9.4/mogon3.specs

@@ -38,7 +38,7 @@ comment="Dependencies for Mogon 2 supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"

scripts/profiles/0.9.4/ngio.specs

@@ -38,7 +38,7 @@ comment="Dependencies for NEXTGenIO prototype cluster"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"

scripts/profiles/0.9.4/omnipath_psm2.specs

@@ -38,7 +38,7 @@ comment="Dependencies for Omnipath supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"

scripts/profiles/0.9.4/p9.specs

@@ -38,7 +38,7 @@ comment="Dependencies for PowerPC supercomputer"
 # Dependencies that must be downloaded directly
 wgetdeps=(
     ["lz4"]="1.9.4"
-    ["capstone"]="5.0.5"
+    ["capstone"]="4.0.2"
     ["argobots"]="1.2"
     ["rocksdb"]="8.10.0"
     ["json-c"]="0.17-20230812"
@@ -66,7 +66,7 @@ clonedeps_patches=(
 
 # Ordering that MUST be followed when downloading
 order=(
-    "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date"
+    "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "date" 
 )
 
 # Extra arguments passed to the installation script. As such, they can

tests/scripts/dl_dep.sh/0.9.4/agios.out

 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'

tests/scripts/dl_dep.sh/0.9.4/arm.out

 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'

tests/scripts/dl_dep.sh/0.9.4/default.out

 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'

tests/scripts/dl_dep.sh/0.9.4/default_zmq.out

 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'

tests/scripts/dl_dep.sh/0.9.4/infiniband_verbs.out

 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric%verbs' with commit '[HEAD]' and flags '--branch=v1.20.1'
 Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'

tests/scripts/dl_dep.sh/0.9.4/marenostrum4.out

 Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'
-Downloaded 'https://github.com/aquynh/capstone/archive/5.0.5.tar.gz' to 'capstone'
+Downloaded 'https://github.com/aquynh/capstone/archive/4.0.2.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Downloaded 'https://github.com/cornelisnetworks/opa-psm2/archive/PSM2_11.2.185.tar.gz' to 'psm2'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v1.20.1'