Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2020-08-21 12:37:14 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2020-08-21 12:37:14 +0300
commit175179dc5d53838cfe355a883d52c1aa219e0eba (patch)
tree07d571624299b86bbc780b2d92527332640fb37b
parentaa8f77131ab962f6d69a066fa028f22aaa875237 (diff)
Makefile: Use sha256sum instead of shasum
CentOS doesn't ship the `shasum` binary, but instead only ships `sha256sum` and family. Let's use them instead to unblock building on those distros.
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index f2c400a7a..b006ec692 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ assemble-ruby:
.PHONY: binaries
binaries: assemble
${Q}if [ ${ARCH} != 'x86_64' ]; then echo Incorrect architecture for build: ${ARCH}; exit 1; fi
- ${Q}cd ${ASSEMBLY_ROOT} && shasum -a 256 bin/* | tee checksums.sha256.txt
+ ${Q}cd ${ASSEMBLY_ROOT} && sha256sum bin/* | tee checksums.sha256.txt
.PHONY: prepare-tests
prepare-tests: ${GITLAB_SHELL_DIR}/config.yml ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle
@@ -352,17 +352,17 @@ ${PROTOC}: ${BUILD_DIR}/protoc.zip | ${BUILD_DIR}
# jobs of a CI pipeline, we start depending on its hash. Like this, we only
# rebuild if the Makefile actually has changed contents.
${BUILD_DIR}/Makefile.sha256: Makefile | ${BUILD_DIR}
- ${Q}shasum -a256 -c $@ >/dev/null 2>&1 || >$@ shasum -a256 Makefile
+ ${Q}sha256sum -c $@ >/dev/null 2>&1 || >$@ sha256sum Makefile
${BUILD_DIR}/protoc.zip: ${BUILD_DIR}/Makefile.sha256
${Q}if [ -z "${PROTOC_URL}" ]; then echo "Cannot generate protos on unsupported platform ${OS}" && exit 1; fi
curl -o $@.tmp --silent --show-error -L ${PROTOC_URL}
- ${Q}printf '${PROTOC_HASH} $@.tmp' | shasum -a256 -c -
+ ${Q}printf '${PROTOC_HASH} $@.tmp' | sha256sum -c -
${Q}mv $@.tmp $@
${BUILD_DIR}/git_full_bins.tgz: ${BUILD_DIR}/Makefile.sha256
curl -o $@.tmp --silent --show-error -L ${GIT_BINARIES_URL}
- ${Q}printf '${GIT_BINARIES_HASH} $@.tmp' | shasum -a256 -c -
+ ${Q}printf '${GIT_BINARIES_HASH} $@.tmp' | sha256sum -c -
${Q}mv $@.tmp $@
${GOIMPORTS}: ${BUILD_DIR}/Makefile.sha256 ${BUILD_DIR}/go.mod