From 21c7f7fd7dfe686070392e6a967494655ca3bc3a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 23 Jun 2010 22:36:34 +0200 Subject: [PATCH] fix splitting of GITPATH - was ALWAYS pulling master no matter which tag was mentioned.. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index aea676c5..ccdb09f1 100644 --- a/Makefile +++ b/Makefile @@ -294,10 +294,10 @@ define stage1_module_vars ifneq "$($(1)-SVNPATH)" "" $(1)-SVNPATH := $(strip $($(1)-SVNPATH)) else -$(1)-GITPATH := $(strip $($(1)-GITPATH)) -$(1).gitrepo := $(firstword $(subst @, ,$($(1)-GITPATH))) -$(1).gittag := $(word 2,$(subst @, ,$($(1)-GITPATH))) -$(1).gittag := $(if $($(1).gittag),$($(1).gittag),master) +$(1)-GITPATH := $$(strip $$($(1)-GITPATH)) +$(1).gitrepo := $$(firstword $$(subst @, ,$$($(1)-GITPATH))) +$(1).gittag := $$(word 2,$$(subst @, ,$$($(1)-GITPATH))) +$(1).gittag := $$(if $$($(1).gittag),$$($(1).gittag),master) endif endef @@ -769,7 +769,7 @@ info-branches: module-tools: @$(foreach module,$(ALL.modules), \ - $(if $($(module)-GITPATH), \ + $(if $($(module)-GITPATH), \ $(if $($(module)-BRANCH), \ echo git:$(module):$($(module)-BRANCH); , \ echo git:$(module); ), \ -- 2.47.0