Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Required for gitlab-ce 16.3. Use an internal libgit2 as the FreeBSD installed version is to new but git2go does not support a newer version yet: libgit2/git2go#951 Changelog: https://gitlab.com/gitlab-org/gitaly/-/blob/master/CHANGELOG.md
- Loading branch information
Showing
4 changed files
with
52 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| TIMESTAMP = 1693546702 | ||
| SHA256 (go/devel_gitaly/gitaly-v16.1.5/go.mod) = 869d038756ee3f440edad81f05654cccb15a563cc4bbaee1971055ab280ebe3c | ||
| SIZE (go/devel_gitaly/gitaly-v16.1.5/go.mod) = 10223 | ||
| SHA256 (go/devel_gitaly/gitaly-v16.1.5/gitaly-v16.1.5.tar.bz2) = 5ee7a0f62c25d1367a1788a2bea829c4e876a0165f69cf65bf29e8b95721ddcb | ||
| SIZE (go/devel_gitaly/gitaly-v16.1.5/gitaly-v16.1.5.tar.bz2) = 2645668 | ||
| TIMESTAMP = 1693571940 | ||
| SHA256 (go/devel_gitaly/gitaly-v16.3.0/go.mod) = 90b3743fb25526e4b77aeca1a9b00d0a99c5288da835d80bf29121fb2a211db2 | ||
| SIZE (go/devel_gitaly/gitaly-v16.3.0/go.mod) = 10532 | ||
| SHA256 (go/devel_gitaly/gitaly-v16.3.0/libgit2-libgit2-v1.5.1_GH0.tar.gz) = 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 | ||
| SIZE (go/devel_gitaly/gitaly-v16.3.0/libgit2-libgit2-v1.5.1_GH0.tar.gz) = 5895483 | ||
| SHA256 (go/devel_gitaly/gitaly-v16.3.0/gitaly-v16.3.0.tar.bz2) = d21c2eeb36018c423f6612362a542873e33e2c1938a76fd6c29f3b4519bfa14d | ||
| SIZE (go/devel_gitaly/gitaly-v16.3.0/gitaly-v16.3.0.tar.bz2) = 2461594 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,25 @@ | ||
| --- Makefile.orig 2023-04-21 08:04:56 UTC | ||
| --- Makefile.orig 2023-08-21 09:20:49 UTC | ||
| +++ Makefile | ||
| @@ -573,7 +573,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU | ||
| @ # This fallback is unique but non-deterministic, making it sufficient to avoid generating the | ||
| @ # GNU build-id from the empty string and causing guaranteed collisions. | ||
| ${Q}GO_BUILD_ID=$$(go tool buildid "$<" || openssl rand -hex 32) && \ | ||
| - GNU_BUILD_ID=$$(echo $$GO_BUILD_ID | sha1sum | cut -d' ' -f1) && \ | ||
| + GNU_BUILD_ID=$$(echo $$GO_BUILD_ID | sha1 | cut -d' ' -f1) && \ | ||
| if test "${OS}" = "Linux"; then \ | ||
| go run "${SOURCE_DIR}"/tools/replace-buildid \ | ||
| -input "$<" -input-build-id "${TEMPORARY_BUILD_ID}" \ | ||
| @@ -599,7 +599,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_ | ||
| ${BUILD_DIR}/intermediate/gitaly: remove-legacy-go-mod ${GITALY_PACKED_EXECUTABLES} | ||
| ${BUILD_DIR}/intermediate/praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} | ||
| ${BUILD_DIR}/intermediate/gitaly-git2go: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} | ||
| -${BUILD_DIR}/intermediate/gitaly-git2go: libgit2 | ||
| ${BUILD_DIR}/intermediate/%: clear-go-build-cache-if-needed .FORCE | ||
| @ # We're building intermediate binaries first which contain a fixed build ID | ||
| @ # of "TEMP_GITALY_BUILD_ID". In the final binary we replace this build ID with | ||
| @@ -628,16 +628,16 @@ ${DEPENDENCY_DIR}/protoc.version: dependency-version | | ||
| ${Q}[ x"$$(cat "$@" 2>/dev/null)" = x"${PROTOC_VERSION} ${PROTOC_BUILD_OPTIONS}" ] || >$@ echo -n "${PROTOC_VERSION} ${PROTOC_BUILD_OPTIONS}" | ||
|
|
||
| ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a: ${DEPENDENCY_DIR}/libgit2.version | ||
| - ${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR} | ||
| - ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.url ${LIBGIT2_REPO_URL} | ||
| - ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.tagOpt --no-tags | ||
| - ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} origin ${LIBGIT2_VERSION} | ||
| - ${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" checkout ${GIT_QUIET} --detach FETCH_HEAD | ||
| + #${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} ${LIBGIT2_SOURCE_DIR} | ||
| + #${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.url ${LIBGIT2_REPO_URL} | ||
| + #${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" config remote.origin.tagOpt --no-tags | ||
| + #${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" fetch --depth 1 ${GIT_QUIET} origin ${LIBGIT2_VERSION} | ||
| + #${Q}${GIT} -C "${LIBGIT2_SOURCE_DIR}" checkout ${GIT_QUIET} --detach FETCH_HEAD | ||
| ${Q}rm -rf ${LIBGIT2_BUILD_DIR} | ||
| ${Q}mkdir -p ${LIBGIT2_BUILD_DIR} | ||
| ${Q}cd ${LIBGIT2_BUILD_DIR} && cmake ${LIBGIT2_SOURCE_DIR} ${LIBGIT2_BUILD_OPTIONS} | ||
| ${Q}CMAKE_BUILD_PARALLEL_LEVEL=$(shell nproc) cmake --build ${LIBGIT2_BUILD_DIR} --target install | ||
| - go install -a github.com/libgit2/git2go/${GIT2GO_VERSION} | ||
| + #go install -a github.com/libgit2/git2go/${GIT2GO_VERSION} | ||
|
|
||
| # This target is responsible for checking out Git sources. In theory, we'd only | ||
| # need to depend on the source directory. But given that the source directory |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters