diff options
| author | Doug Ledford <dledford@redhat.com> | 2008-07-22 20:07:01 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2008-07-22 20:07:01 -0400 |
| commit | 3319d1aa57ae5ccdaf8baf253812af5f6c870801 (patch) | |
| tree | 274ec490754292da8f304ddf84ff7ffa8e517bb0 | |
| parent | b123410144699c7e92ff37d840d95fc67ea01426 (diff) | |
| download | common-3319d1aa57ae5ccdaf8baf253812af5f6c870801.tar.gz common-3319d1aa57ae5ccdaf8baf253812af5f6c870801.tar.xz common-3319d1aa57ae5ccdaf8baf253812af5f6c870801.zip | |
Separate BRANCH from GIT_BRANCH and use each where appropriate
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | Makefile.repo-git | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.repo-git b/Makefile.repo-git index ce9e9ea..118620d 100644 --- a/Makefile.repo-git +++ b/Makefile.repo-git @@ -12,7 +12,12 @@ ifndef HEAD_BRANCH HEAD_BRANCH := fedora-devel endif +# While we use BRANCH for looking up our build target in common/branches, we +# use GIT_BRANCH for passing to koji as our specific branch we are building +# from and it must match our working branch, so no futzing around with it +# like they did with BRANCH BRANCH:=$(shell git branch | awk '/^\* /{ print $$2 }' ) +GIT_BRANCH:=$(shell git branch | awk '/^\* /{ print $$2 }' ) # check to see if this is an early branched package; we should make this more # generic in the future # Eh? It wasn't clear to me what this did when I converted it from cvs to git, @@ -137,7 +142,7 @@ endif # otherwise TAG?=$(shell if [ -z `git tag | grep $(NVR)` ]; then echo HEAD; else echo $(NVR); fi) -URL := $(REPOSITORY)\#$(BRANCH)\#$(TAG) +URL := $(REPOSITORY)\#$(GIT_BRANCH)\#$(TAG) # allow overriding buildarch so you can do, say, an i386 build on x86_64 ifndef BUILDARCH |