diff options
| author | Doug Ledford <dledford@redhat.com> | 2008-07-24 20:07:58 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2008-07-24 20:07:58 -0400 |
| commit | 06bed78bfb84efe15d39edb8036e4ec8e90fca8d (patch) | |
| tree | 9585b1c9dd58cbffb04f4949ebc5455b0feed941 | |
| parent | 34b3555176ede348072919562ecaf46b6a21ed60 (diff) | |
| download | common-master.tar.gz common-master.tar.xz common-master.zip | |
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | Makefile.repo-git | 7 | ||||
| -rw-r--r-- | branches | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.repo-git b/Makefile.repo-git index 118620d..949ffa0 100644 --- a/Makefile.repo-git +++ b/Makefile.repo-git @@ -46,6 +46,7 @@ endif ## these variables. SRCRPMDIR ?= $(WORKDIR)/distropkg/rpm/SRPMS BUILDDIR ?= $(WORKDIR)/distropkg/rpm/BUILD +REPODIR ?= $(shell dirname `pwd`) RPMDIR ?= $(WORKDIR)/distropkg/rpm/RPMS MOCKDIR ?= $(WORKDIR)/distropkg/rpm/MOCK ifeq ($(DISTVAR),epel) @@ -81,7 +82,7 @@ endif ifndef REPO_RPM_DEFINES REPO_RPM_DEFINES = --define "_sourcedir $(SPECDIR)" \ --define "_specdir $(SPECDIR)" \ - --define "_builddir $(WORKDIR)" \ + --define "_builddir $(REPODIR)" \ --define "_srcrpmdir $(SRCRPMDIR)" \ --define "_rpmdir $(RPMDIR)" \ $(DIST_DEFINES) @@ -120,7 +121,7 @@ include $(FEDORA_REPO_RC) endif # The repository and the clients we use for the files -REPOSITORY ?= $(shell git config --get remote.fedora.url) +REPOSITORY ?= $(shell rpm $(RPM_DEFINES) $(DIST_DEFINES) -q --qf "%{SCMType}+%{SCMURL}?%{SCMModule}\n" --specfile $(SPECFILE)| head -1) BUILD_CLIENT ?= $(shell which koji 2>/dev/null) BODHI_CLIENT ?= $(shell which bodhi 2>/dev/null) @@ -157,7 +158,7 @@ ARCHES = noarch i386 i586 i686 x86_64 ia64 s390 s390x ppc ppc64 pseries ppc64pse ## =================================================== ## list all our bogus targets, both hidden and public -.PHONY :: bp bp-% bc bc-% bi bi-% bb bb-% commit-check distrohelp fedora-default mockbuild new notag-check repourl repo-push rpmclean scratch-build scratch-build-% tag-check tarball verrel +.PHONY : bp bp-% bc bc-% bi bi-% bb bb-% commit-check distrohelp fedora-default mockbuild new notag-check repourl repo-push rpmclean scratch-build scratch-build-% tag-check tarball verrel # The first target in the Makefile is always the default. Generally, we won't # have to worry about ever being first because the upstream make targets will @@ -21,3 +21,4 @@ f8:dist-f8-updates-candidate:.fc8:fedora:8 f9:dist-F9-SCM-build:.f9:fedora:9 f10:dist-F10-SCM-build:.f10:fedora:10 fedora-devel:dist-F10-SCM-build:.f10:fedora:10 +SCMRepo:dist-F10-SCM-build:.f10:fedora:10 |