[Jpackage-commits] dist/common Makefile.common,1.9,1.10

jpackage jpackage at ryu.zarb.org
Tue May 27 21:59:45 CEST 2008


Update of /home/projects/jpackage/cvs/dist/common
In directory ryu.zarb.org:/tmp/cvs-serv7204

Modified Files:
	Makefile.common 
Log Message:
Replace plague with joes

Index: Makefile.common
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/common/Makefile.common,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** Makefile.common	26 May 2008 22:34:58 -0000	1.9
--- Makefile.common	27 May 2008 19:59:42 -0000	1.10
***************
*** 137,143 ****
  WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
  CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
- PLAGUE_CLIENT ?= $(shell which plague-client 2>/dev/null)
  BUILD_CLIENT ?= $(shell which koji 2>/dev/null)
  BODHI_CLIENT ?= $(shell which bodhi 2>/dev/null)
  
  # RPM with all the overrides in place; you can override this in your
--- 137,143 ----
  WGET	?= $(shell if test -f /usr/bin/wget ; then echo "wget -nd -m" ; fi)
  CLIENT	?= $(if $(CURL),$(CURL),$(if $(WGET),$(WGET)))
  BUILD_CLIENT ?= $(shell which koji 2>/dev/null)
  BODHI_CLIENT ?= $(shell which bodhi 2>/dev/null)
+ JOES_BUILD_HOST ?= build.joesauer.org
  
  # RPM with all the overrides in place; you can override this in your
***************
*** 421,427 ****
  	if [ $$ret -ne 0 ]; then echo "$(SPECFILE) not tagged with tag $(TAG)"; exit 1;  fi
  
! plague: build-check $(COMMON_DIR)/branches
! 	@if [ ! -x "$(PLAGUE_CLIENT)" ]; then echo "Must have plague-client installed - see http://fedoraproject.org/wiki/Extras/BuildSystemClientSetup"; exit 1; fi
! 	$(PLAGUE_CLIENT) build $(NAME) $(TAG) $(TARGET)
  
  koji: build-check $(COMMON_DIR)/branches
--- 421,427 ----
  	if [ $$ret -ne 0 ]; then echo "$(SPECFILE) not tagged with tag $(TAG)"; exit 1;  fi
  
! joes: build-check srpm $(COMMON_DIR)/branches
! 	scp ./${SRPM} ${JOES_BUILD_HOST}:~
! 	ssh ${USER}@${JOES_BUILD_HOST} "/home/${USER}/mockwrapper-${TARGET}.sh /home/${USER}/${SRPM}"
  
  koji: build-check $(COMMON_DIR)/branches
***************
*** 432,436 ****
  build: koji
  else
! build: plague
  endif
  
--- 432,436 ----
  build: koji
  else
! build: joes
  endif
  




More information about the JPackage-commits mailing list