diff options
| author | Karthik Nayak <knayak@gitlab.com> | 2023-10-19 22:39:40 +0300 |
|---|---|---|
| committer | Karthik Nayak <knayak@gitlab.com> | 2023-10-24 12:19:28 +0300 |
| commit | 9588a8cd9a3e9ca4a751c4d661a4989c1c444470 (patch) | |
| tree | 2d71bd353ede42f5b04d04fa6c4a988daec8d4ff | |
| parent | e0e708349194191c4c546b885fc1f18619a2ced1 (diff) | |
Makefile: Stop building git 2.41
In the previous release we had removed the flag to use 2.41. In this
release we can stop building it and remove it entirely.
| -rw-r--r-- | Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -126,8 +126,6 @@ GIT_EXECUTABLES += git-http-backend ## WITH_BUNDLED_GIT=YesPlease. Can be set to an arbitrary Git revision with ## tags, branches, and commit ids. GIT_VERSION ?= -## The Git version used for bundled Git v2.41. -GIT_VERSION_2_41 ?= v2.41.0.gl1 ## The Git version used for bundled Git v2.42. GIT_VERSION_2_42 ?= v2.42.0 @@ -282,15 +280,13 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. -build-bundled-git: build-bundled-git-v2.41 build-bundled-git-v2.42 -build-bundled-git-v2.41: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.41,${GIT_EXECUTABLES}) +build-bundled-git: build-bundled-git-v2.42 build-bundled-git-v2.42: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.42,${GIT_EXECUTABLES}) .PHONY: install-bundled-git ## Install bundled Git binaries. The target directory can be modified by ## setting PREFIX and DESTDIR. -install-bundled-git: install-bundled-git-v2.41 install-bundled-git-v2.42 -install-bundled-git-v2.41: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.41,${GIT_EXECUTABLES}) +install-bundled-git: install-bundled-git-v2.42 install-bundled-git-v2.42: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.42,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT @@ -534,10 +530,6 @@ ${DEPENDENCY_DIR}/git-distribution/git: ${DEPENDENCY_DIR}/git-distribution/Makef ${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C "$(<D)" -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS} ${Q}touch $@ -${BUILD_DIR}/bin/gitaly-%-v2.41: override GIT_VERSION = ${GIT_VERSION_2_41} -${BUILD_DIR}/bin/gitaly-%-v2.41: ${DEPENDENCY_DIR}/git-v2.41/% | ${BUILD_DIR}/bin - ${Q}install $< $@ - ${BUILD_DIR}/bin/gitaly-%-v2.42: override GIT_VERSION = ${GIT_VERSION_2_42} ${BUILD_DIR}/bin/gitaly-%-v2.42: ${DEPENDENCY_DIR}/git-v2.42/% | ${BUILD_DIR}/bin ${Q}install $< $@ |