diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-22 18:05:35 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-08-22 21:41:26 +0000 |
| commit | d41e73b2bcdbb30cc967e2fe985a4aa85d351eda (patch) | |
| tree | a0df84c0d016c47b400950c6789b7546ef475d63 /Makefile | |
| parent | 85233d92b0b0d526aa641cab4b8d9d794da109e9 (diff) | |
Fix: git -C not available for git 1.8
Our deploy slaves are running CentOS, which only has git 1.8.3.
git -C option was made available in git 1.8.5, so instead of
installing out of repo versions of git on all our deploy slaves,
rework the main Armband Makefile to NOT use this option.
NOTE: --git-dir could be used instead, too.
Change-Id: I29b9c720e39cae25431cf1176dbaddce5bda2a35
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit e7683a82ee118c2a584fb441a7a422dfca826e28)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -79,14 +79,14 @@ patches-export: submodules-init # For repos pinned in Fuel@OPNFV's config.mk, checkout pinned commit first .PHONY: patches-import patches-import: submodules-init - @git -C ${FUEL_BASE} checkout -q master - @git -C ${SUBMOD_DIR}/fuel-agent checkout -q ${FUEL_AGENT_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-astute checkout -q ${ASTUTE_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-library checkout -q ${FUELLIB_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-mirror checkout -q ${FUEL_MIRROR_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-nailgun-agent \ - checkout -q ${FUEL_NAILGUN_AGENT_COMMIT} - @git -C ${SUBMOD_DIR}/fuel-web checkout -q ${NAILGUN_COMMIT} + @cd ${FUEL_BASE} && git checkout -q master + @cd ${SUBMOD_DIR}/fuel-agent && git checkout -q ${FUEL_AGENT_COMMIT} + @cd ${SUBMOD_DIR}/fuel-astute && git checkout -q ${ASTUTE_COMMIT} + @cd ${SUBMOD_DIR}/fuel-library && git checkout -q ${FUELLIB_COMMIT} + @cd ${SUBMOD_DIR}/fuel-mirror && git checkout -q ${FUEL_MIRROR_COMMIT} + @cd ${SUBMOD_DIR}/fuel-nailgun-agent && \ + git checkout -q ${FUEL_NAILGUN_AGENT_COMMIT} + @cd ${SUBMOD_DIR}/fuel-web && git checkout -q ${NAILGUN_COMMIT} @git submodule -q foreach ' \ mkdir -p ${PATCH_DIR}/$$name; \ git tag armband-workbench-root; \ |