OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 08-Jan-2004 21:00:27
Branch: HEAD Handle: 2004010820002700
Modified files:
openpkg-re/release Makefile
Log:
flush some of my pending build farm changes
Summary:
Revision Changes Path
1.14 +33 -26 openpkg-re/release/Makefile
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/release/Makefile
============================================================================
$ cvs diff -u -r1.13 -r1.14 Makefile
--- openpkg-re/release/Makefile 15 Oct 2003 18:27:59 -0000 1.13
+++ openpkg-re/release/Makefile 8 Jan 2004 20:00:27 -0000 1.14
@@ -12,21 +12,24 @@
# OpenPKG build platforms
HOSTNAME = `hostname | sed -e 's;\..*$$;;'`
TARGET = `$(PREFIX)/bin/rpm --eval '%{l_platform -p}'`
-PLATFORMS = dv1:ix86-freebsd4.9 \
- dv2:ix86-freebsd5.1 \
- dv6:ix86-debian3.0 \
- dv5:ix86-debian2.2 \
- dv9:sparc64-solaris9 \
- dv8:sparc64-solaris8 \
- dv4:ix86-redhat9 \
- dv14:ix86-suse8.2 \
- dv7:ix86-solaris9
- #dv13:sparc64-solaris2.6 \
- #dv12:alpha-freebsd5.1
+PLATFORMS = dv1:ixFB4:ix86-freebsd4.9 \
+ dv2:ixFB5:ix86-freebsd5.2 \
+ dv5:ixDL2:ix86-debian2.2 \
+ dv6:ixDL3:ix86-debian3.0 \
+ dv19:ixDLT:ix86-debian3.1 \
+ dv4:ixRL9:ix86-redhat9 \
+ dv23:ixRA3:ix86-redhatas3 \
+ dv14:ixSL8:ix86-suse8.2 \
+ dv17:ixSL9:ix86-suse9.0 \
+ dv7:ixSO9:ix86-solaris9 \
+ dv9:usSO9:sparc64-solaris9 \
+ dv8:usSO8:sparc64-solaris8 \
+ dv16:ixSOX:ix86-solaris10 \
+ dv13:usSO6:sparc64-solaris2.6
+ #dv12:alpha-freebsd5.2
# OpenPKG package classes
-CLASSES = +CORE
-#CLASSES = +CORE+BASE+PLUS+EVAL-JUNK
+CLASSES = +CORE+BASE+PLUS+EVAL-JUNK
#CLASSES = +CORE+BASE+PLUS
# OpenPKG sources
@@ -37,6 +40,7 @@
CUR_SOURCE = $(MASTER_FTP)/current/SRC/
CUR_EXTRA = /e/openpkg/PKG/src/
REL_INDEX = $(MASTER_FTP)/release/1.3/SRC/00INDEX.rdf.bz2
+SKIP_PKGS = kde*.src.rpm
# internals
WORK = .
@@ -52,7 +56,7 @@
master-buildfarm buildfarm:
[EMAIL PROTECTED] [ ".`screen -list | grep openpkg-buildfarm`" != . ]; then \
$(SHTOOL) echo -e "%B++ reconnecting to running build-farm environment%b";
\
- exec screen -r openpkg-buildfarm; \
+ exec screen -r openpkg-buildfarm -p =; \
else \
$(SHTOOL) echo -e "%B++ establishing new build-farm environment%b"; \
bashrc="$(ROOTDIR)/tmp/master-builfarm-bashrc"; \
@@ -65,8 +69,8 @@
( echo "vbell off"; \
echo "screen -t \"$(HOSTNAME) [MASTER]\" $(SHELL)"; \
for platform in $(PLATFORMS); do \
- eval `echo "$$platform" | sed -e
's/^\([^:]*\):\(.*\)$$/hostname="\1"; target="\2";/'`; \
- echo "screen -t $$hostname ssh -t -x $$hostname $(SHELL)
--rcfile $$bashrc"; \
+ eval `echo "$$platform" | sed -e
's/^\([^:]*\):\([^:]*\):\(.*\)$$/hostname="\1"; id="\2"; target="\3";/'`; \
+ echo "screen -t \"$$hostname [$$id]\" ssh -t -x $$hostname
$(SHELL) --rcfile $$bashrc"; \
done; \
echo "select 0"; \
) >$$screenrc; \
@@ -91,7 +95,7 @@
scp -q status.txt $(MASTER_WEB)/ || true; \
rm -f status.txt; \
for platform in $(PLATFORMS); do \
- eval `echo "$$platform" | sed -e
's/^\([^:]*\):\(.*\)$$/hostname="\1"; target="\2";/'`; \
+ eval `echo "$$platform" | sed -e
's/^\([^:]*\):\([^:]*\):\(.*\)$$/hostname="\1"; id="\2"; target="\3";/'`; \
rsync --rsh=ssh -rav --delete \
log/$$hostname-*/*.log.*
log/$$hostname-*/processing.* \
$(MASTER_WEB)/status.log/ >/dev/null 2>&1 ||
true; \
@@ -118,6 +122,7 @@
master-download:
@$(SHTOOL) echo -e "%B++ Downloading latest OpenPKG-CURRENT master source RPMs
($(WORK)/src/master/)%b"
@rsync -ra --rsh=ssh --delete --exclude "Makefile*" $(CUR_SOURCE)
$(WORK)/src/master/
+ @(cd $(WORK)/src/master && rm -f $(SKIP_PKGS))
@scp -q $(REL_INDEX) $(WORK)/src/master/00INDEX-release.rdf.bz2
@bunzip2 $(WORK)/src/master/00INDEX*.rdf.bz2
@for src in $(WORK)/src/master/*.nosrc.rpm; do \
@@ -141,24 +146,26 @@
@$(SHTOOL) echo -e "%B++ Creating master status report%b"
@status=""; \
for platform in $(PLATFORMS); do \
- eval `echo "$$platform" | sed -e 's/^\([^:]*\):\(.*\)$$/hostname="\1";
target="\2";/'`; \
- hostname=`echo "$$hostname " | cut -c1-4`; \
- status="$$status $$hostname"; \
+ eval `echo "$$platform" | sed -e
's/^\([^:]*\):\([^:]*\):\(.*\)$$/hostname="\1"; id="\2"; target="\3";/'`; \
+ id=`echo "$$id " | cut -c1-5`; \
+ status="$$status $$id"; \
done; \
echo . | awk '{ printf("%-15s %-15s %-10s %-4s %-3s %s\n", n, v, r, d, l, s);
}' \
n="Name" v="Version" r="Release" d="Dst" l="Rel" s="$$status"; \
- echo "=============== =============== ========== ==== ===
=================================="; \
+ echo "=============== =============== ========== ==== ===
====================================================="; \
for srpm in `ls -1 $(WORK)/src/master/*.src.rpm | sort`; do \
base=`echo "$$srpm" | sed -e
's;^$(WORK)/src/master/\(.*\)\.src\.rpm$$;\1;'`; \
eval `echo "$$base" | sed -e
's/^\(.*\)-\([^-][^-]*\)-\([^-][^-]*\)$$/name="\1"; version="\2"; release="\3";/'`; \
distrib=`$(PREFIX)/bin/rpm -qp --qf '%{DISTRIBUTION}' $$srpm | sed -e
's;^.*\[\(.*\)\].*;\1;'`; \
status=""; \
for platform in $(PLATFORMS); do \
- eval `echo "$$platform" | sed -e
's/^\([^:]*\):\(.*\)$$/hostname="\1"; target="\2";/'`; \
+ eval `echo "$$platform" | sed -e
's/^\([^:]*\):\([^:]*\):\(.*\)$$/hostname="\1"; id="\2"; target="\3";/'`; \
if [ -f
"$(WORK)/bin/$$hostname-$$target/$$base.$$target-$(LOCATION).rpm" ]; then \
- status="$$status OK "; \
+ status="$$status OK "; \
+ elif [ ".`grep 'Build End:'
$(WORK)/log/$$hostname-$$target/$$base.log.$$hostname.$$target-$(LOCATION)
2>/dev/null`" != . ]; then \
+ status="$$status FAIL "; \
else \
- status="$$status -- "; \
+ status="$$status -- "; \
fi; \
done; \
if [ ".`egrep '<Name>'$$name'</Name>'
$(WORK)/src/master/00INDEX-release.rdf`" != . ]; then \
@@ -194,7 +201,7 @@
@$(SHTOOL) echo -e "%B++ STARTING SLAVE LOOP ($(HOSTNAME))%b"; \
cd $(WORK); PWD=`pwd`; export PWD; \
while [ 1 ]; do \
- ./shtool echo -e "%B++ client [$(HOSTNAME)]: erasing OpenPKG
instrance%b"; \
+ ./shtool echo -e "%B++ client [$(HOSTNAME)]: erasing OpenPKG
instance%b"; \
$(MAKE) slave-erase; \
./shtool echo -e "%B++ client [$(HOSTNAME)]: preparing build
environment%b"; \
$(MAKE) slave-prepare; \
@@ -234,7 +241,7 @@
n=0; \
me=0; \
for platform in $(PLATFORMS); do \
- eval `echo "$$platform" | sed -e 's/^\([^:]*\):\(.*\)$$/hostname="\1";
target="\2";/'`; \
+ eval `echo "$$platform" | sed -e
's/^\([^:]*\):\([^:]*\):\(.*\)$$/hostname="\1"; id="\2"; target="\3";/'`; \
if [ ".$$hostname" = ".$(HOSTNAME)" ]; then \
me="$$n"; \
fi; \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
