OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-re                       Date:   18-Jan-2005 10:08:07
  Branch: HEAD                             Handle: 2005011809080700

  Modified files:
    openpkg-re/release      Makefile

  Log:
    dismantle old master based build farm status generation from Makefile

  Summary:
    Revision    Changes     Path
    1.32        +4  -24     openpkg-re/release/Makefile
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/release/Makefile
  ============================================================================
  $ cvs diff -u -r1.31 -r1.32 Makefile
  --- openpkg-re/release/Makefile       18 Jan 2005 09:01:24 -0000      1.31
  +++ openpkg-re/release/Makefile       18 Jan 2005 09:08:07 -0000      1.32
  @@ -60,8 +60,8 @@
   #   internals
   WORK        = .
   MPX         = /usr/opkg/bin/openpkg
  -SRC2MAKE    = src2make
  -SHTOOL      = ./shtool
  +SRC2MAKE    = "${MPX} src2make"
  +SHTOOL      = "${MPX} shtool"
   
   all: buildfarm
   
  @@ -98,30 +98,10 @@
        fi
   
   master:
  -     @$(SHTOOL) echo -e "%B++ STARTING MASTER LOOP ($(HOSTNAME))%b"; \
  +     @$(SHTOOL) echo -e "%B++ RUN MASTER LOOP on $(HOSTNAME)%b"; \
        cd $(WORK); PWD=`pwd`; export PWD; \
        while [ 1 ]; do \
                $(MAKE) master-prepare; \
  -             i=0; \
  -             while [ $$i -lt 1 ]; do \
  -                     ./shtool echo -e "%B++ master: generating status 
report%b"; \
  -                     $(MAKE) --no-print-directory master-report 
>$(WORK)/tmp/status.txt; \
  -                     ./shtool echo -e "%B++ master: uploading status 
report%b"; \
  -                     scp -q $(WORK)/tmp/status.txt $(MASTER_WEB)/ || true; \
  -                     mv $(WORK)/tmp/status.txt $(WORK)/tmp/status.old; \
  -                     ./shtool echo -e "%B++ master: synchronizing logfiles 
to web host%b"; \
  -             for platform in $(PLATFORMS); do \
  -                         eval `echo "$$platform" | sed -e 
's/^\([^:]*\):\([^:]*\):\(.*\)$$/hostname="\1"; id="\2"; target="\3";/'`; \
  -                         ./shtool echo -e "%B++ master: start synchronizing 
(rsync) $$hostname...%b"; \
  -                             rsync --rsh=ssh -rtv --delete 
log/$$hostname-*/processing.* $(MASTER_WEB)/log/ || true; \
  -                             rsync --rsh=ssh -rtv --delete 
log/$$hostname-*/[a-k]*.log.* $(MASTER_WEB)/log/ || true; \
  -                             rsync --rsh=ssh -rtv --delete 
log/$$hostname-*/[l-z]*.log.* $(MASTER_WEB)/log/ || true; \
  -                         ./shtool echo -e "%B++ master: done synchronizing 
(rsync) $$hostname...%b"; \
  -                     done; \
  -                     ./shtool echo -e "%B++ master: sleeping (60s, round 
$$i)%b"; \
  -                     sleep 60; \
  -                     i=`expr $$i + 1`; \
  -             done; \
        done
   
   master-prepare:
  @@ -158,7 +138,7 @@
   
   master-makefile:
        @$(SHTOOL) echo -e "%B++ Generating Makefiles for build procedure 
($(WORK)/src/master/Makefile*)%b"
  -     @$(MPX) $(SRC2MAKE) --prefix=$(PREFIX) --user=$(USER) --group=$(GROUP) \
  +     @$(SRC2MAKE) --prefix=$(PREFIX) --user=$(USER) --group=$(GROUP) \
                            --srcdir=$(WORK)/src/master --tmpdir=$(WORK)/tmp 
--outdir=$(WORK)/src/master \
                            --classes=$(CLASSES) --verbose
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to