Commit 4ec699dd authored by Ramon Nou's avatar Ramon Nou
Browse files

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

Jathenst/328 update capstone to 5 0 0

#328

See merge request !218
parents 70f9bbd3 e61e7e83

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -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.
@@ -16,6 +17,7 @@ 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 6.0.0-Alpha1 and syscall intercept to match ([!215](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/215)).

### Fixed



## [0.9.3] - 2024-07

docker/0.9.4/core/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ RUN apt-get update && \ 
		# RocksDB dependencies

		liblz4-dev \

		# syscall_intercept dependencies

		libcapstone-dev \

		# libcapstone-dev \

		# GekkoFS dependencies

		libboost-program-options-dev \

		uuid-dev ccache && \

docker/build_env.docker

+4 −4
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ RUN yum -y -q update && yum -y -q install \ 
	devtoolset-8-gcc-c++ \

	libuuid-devel \

	# syscall_intercept

	capstone \

	capstone-devel \

	# capstone \

	# capstone-devel \

&& yum -y -q clean all



# Enable gcc/g++ 8.x
@@ -100,8 +100,8 @@ RUN yum -y -q update && yum -y -q install \ 
	devtoolset-8-gcc-c++ \

	libuuid-devel \

	# syscall_intercept

	capstone \

	capstone-devel \

	# capstone \

	# capstone-devel \

&& yum -y -q clean all

scripts/profiles/0.9.4/agios.specs

+2 −7
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ comment="All dependencies (except transport-specific and experimental)" 
# Dependencies that must be downloaded directly

wgetdeps=(

    ["lz4"]="1.9.4"

    ["capstone"]="4.0.2"

    ["capstone"]="6.0.0-Alpha1"

    ["argobots"]="1.2"

    ["rocksdb"]="8.10.0"

    ["json-c"]="0.17-20230812"
@@ -49,7 +49,7 @@ clonedeps=( 
    ["libfabric"]="HEAD@v1.20.1"

    ["mercury"]="v2.4.0"

    ["margo"]="v0.18.3"

    ["syscall_intercept"]="2c8765fa292bc9c28a22624c528580d54658813d"

    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"

    ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development"

)
@@ -58,11 +58,6 @@ clonedeps_args=( 
    ["mercury"]="--recurse-submodules"

)



# Patches that should be applied post-clone

clonedeps_patches=(

    ["syscall_intercept"]="syscall_intercept.patch"

)



# Ordering that MUST be followed when downloading

order=(

    "lz4" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept" "agios"

scripts/profiles/0.9.4/arm.specs

+2 −7
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ comment="Dependencies for PowerPC supercomputer" 
# Dependencies that must be downloaded directly

wgetdeps=(

    ["lz4"]="1.9.4"

    ["capstone"]="4.0.2"

    ["capstone"]="6.0.0-Alpha1"

    ["argobots"]="1.2"

    ["rocksdb"]="8.10.0"

    ["json-c"]="0.17-20230812"
@@ -50,7 +50,7 @@ clonedeps=( 
    ["libfabric"]="HEAD@v1.20.1"

    ["mercury"]="v2.4.0"

    ["margo"]="v0.18.3"

    ["syscall_intercept"]="fb73c3924b502e2840a5dc8a18746e395b06a8a6"

    ["syscall_intercept"]="34a41033fce94195700c5ab1e097f40741d7f016"

)



# Extra arguments for git clone
@@ -58,11 +58,6 @@ clonedeps_args=( 
    ["mercury"]="--recurse-submodules"

)



# Patches that should be applied post-clone

clonedeps_patches=(

    ["syscall_intercept"]="syscall_intercept.patch.arm64"

)



# Ordering that MUST be followed when downloading

order=(

    "lz4" "capstone" "json-c" "psm2" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept"