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: 11-Jan-2003 12:07:18
Branch: HEAD Handle: 2003011111071800
Modified files:
openpkg-re/release Makefile
Log:
enhance for OpenPKG 1.2 release engineering process
Summary:
Revision Changes Path
1.9 +40 -25 openpkg-re/release/Makefile
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/release/Makefile
============================================================================
$ cvs diff -u -r1.8 -r1.9 Makefile
--- openpkg-re/release/Makefile 28 Aug 2002 09:38:23 -0000 1.8
+++ openpkg-re/release/Makefile 11 Jan 2003 11:07:18 -0000 1.9
@@ -3,25 +3,28 @@
##
# OpenPKG instance
-PREFIX = /cw
-LOCATION = cw
-USER = cw
-GROUP = cw
+PREFIX = /re
+LOCATION = re
+USER = re
+GROUP = re
+LTMP = /ltmp
# OpenPKG build platforms
HOSTNAME = `hostname | sed -e 's;\..*$$;;'`
TARGET = `$(PREFIX)/bin/rpm --eval '%{l_target}'`
PLATFORMS = dv1:ix86-freebsd4.6 \
- dv5:ix86-linux2.2 \
- dv8:sparc64-solaris2.8 \
+ dv2:ix86-freebsd5.0 \
dv4:ix86-linux2.4 \
+ dv5:ix86-linux2.2 \
dv6:ix86-linux2.4 \
+ dv8:sparc64-solaris2.8 \
dv9:sparc64-solaris2.9
# OpenPKG sources
MASTER_FTP = master.openpkg.org:/e/openpkg/ftp
CUR_SOURCE = $(MASTER_FTP)/current/SRC/
-REL_INDEX = $(MASTER_FTP)/release/1.0/SRC/00INDEX.rdf.bz2
+CUR_EXTRA = /e/openpkg/PKG/src/
+REL_INDEX = $(MASTER_FTP)/release/1.1/SRC/00INDEX.rdf.bz2
# internals
WORK = .
@@ -48,7 +51,14 @@
master-download:
@$(SHTOOL) echo -e "%B++ Downloading latest OpenPKG-CURRENT master source RPMs
($(WORK)/src/master/)%b"
- @rsync -rav --rsh=ssh --delete $(CUR_SOURCE) $(WORK)/src/master/
+ @rsync -rav --progress --rsh=ssh --delete $(CUR_SOURCE) $(WORK)/src/master/
+ @for src in $(WORK)/src/master/*.nosrc.rpm; do \
+ base=`echo $$src | sed -e 's;^.*/\([^/][^/]*\)$$;\1;' -e
's;\.nosrc\.rpm$$;;'`; \
+ if [ ! -f "$(WORK)/src/master/$$base.src.rpm" -a -f
"$(CUR_EXTRA)/$$base.src.rpm" ]; then \
+ echo "$$base.src.rpm (no-source replacement)"; \
+ cp "$(CUR_EXTRA)/$$base.src.rpm" $(WORK)/src/master/; \
+ fi; \
+ done
@scp $(REL_INDEX) $(WORK)/src/master/00INDEX-release.rdf.bz2
@bunzip2 $(WORK)/src/master/00INDEX*.rdf.bz2
@@ -56,7 +66,7 @@
@$(SHTOOL) echo -e "%B++ Generating Makefiles for build procedure
($(WORK)/src/master/Makefile*)%b"
@$(SRC2MAKE) --prefix=$(PREFIX) --user=$(USER) --group=$(GROUP) \
--srcdir=$(WORK)/src/master --tmpdir=$(WORK)/tmp
--outdir=$(WORK)/src/master \
- --classes=+CORE+BASE+PLUS --verbose
+ --classes=+CORE+BASE+PLUS+EVAL+JUNK --verbose
master-status:
@$(SHTOOL) echo -e "%B++ Creating master status report%b"
@@ -66,11 +76,11 @@
hostname=`echo "$$hostname " | cut -c1-4`; \
status="$$status $$hostname"; \
done; \
- echo . | awk '{ printf("%-15s %-15s %-10s %-3s %-3s %s\n", n, v, r, d, l, s);
}' \
+ 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 "=============== =============== ========== === ===
=============================="; \
- for srpm in `ls -1 $(WORK)/src/master/*.src.rpm | sort`; do \
- base=`echo "$$srpm" | sed -e
's;^$(WORK)/src/master/\(.*\)\.src\.rpm$$;\1;'`; \
+ echo "=============== =============== ========== ==== ===
=================================="; \
+ for srpm in `(ls -1 $(WORK)/src/master/*.src.rpm; ls -1
$(WORK)/src/master/*.nosrc.rpm) | sort`; do \
+ base=`echo "$$srpm" | sed -e 's;^$(WORK)/src/master/\(.*\)\.src\.rpm$$;\1;'
-e 's;^$(WORK)/src/master/\(.*\)\.nosrc\.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=""; \
@@ -120,8 +130,8 @@
$(SHTOOL) mkdir -f -p -m 775 $(WORK)/bin/$$hostname-$$target; \
$(SHTOOL) mkdir -f -p -m 775 $(WORK)/tmp/$$hostname-$$target; \
work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
- if [ -d "/ltmp" ]; then \
- tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ if [ -d "$(LTMP)" ]; then \
+ tmp="$(LTMP)/openpkg-$$hostname-$$target"; \
$(SHTOOL) mkdir -f -p -m 775 $$tmp; \
else \
tmp="$$work/tmp/$$hostname-$$target"; \
@@ -131,6 +141,11 @@
for srpm in `ls -1 $(WORK)/src/master/*.src.rpm | sort`; do \
base=`echo "$$srpm" | sed -e
's;^$(WORK)/src/master/\(.*\)\.src\.rpm$$;\1;'`; \
ln $(WORK)/src/master/$$base.src.rpm $(WORK)/src/$$hostname-$$target/;
\
+ done; \
+ rm -f $(WORK)/src/$$hostname-$$target/*.nosrc.rpm; \
+ for srpm in `ls -1 $(WORK)/src/master/*.nosrc.rpm | sort`; do \
+ base=`echo "$$srpm" | sed -e
's;^$(WORK)/src/master/\(.*\)\.nosrc\.rpm$$;\1;'`; \
+ ln $(WORK)/src/master/$$base.nosrc.rpm
$(WORK)/src/$$hostname-$$target/; \
done
slave-build:
@@ -164,8 +179,8 @@
what=`sed <$$tmpfile -e "1,$${x}d"; sed <$$tmpfile -e "$${y},\\$$""d"`; \
rm $$tmpfile; \
work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
- if [ -d "/ltmp/openpkg-$$hostname-$$target" ]; then \
- tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ if [ -d "$(LTMP)/openpkg-$$hostname-$$target" ]; then \
+ tmp="$(LTMP)/openpkg-$$hostname-$$target"; \
else \
tmp="$$work/tmp/$$hostname-$$target"; \
fi; \
@@ -184,8 +199,8 @@
fi; \
$(SHTOOL) echo -e "%B++ Building latest OpenPKG-CURRENT slave source RPMs
($(WORK)/src/$$hostname-$$target/)%b"; \
work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
- if [ -d "/ltmp/openpkg-$$hostname-$$target" ]; then \
- tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ if [ -d "$(LTMP)/openpkg-$$hostname-$$target" ]; then \
+ tmp="$(LTMP)/openpkg-$$hostname-$$target"; \
else \
tmp="$$work/tmp/$$hostname-$$target"; \
fi; \
@@ -204,8 +219,8 @@
fi; \
$(SHTOOL) echo -e "%B++ Building latest OpenPKG-CURRENT slave source RPMs
($(WORK)/src/$$hostname-$$target/)%b"; \
work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
- if [ -d "/ltmp/openpkg-$$hostname-$$target" ]; then \
- tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ if [ -d "$(LTMP)/openpkg-$$hostname-$$target" ]; then \
+ tmp="$(LTMP)/openpkg-$$hostname-$$target"; \
else \
tmp="$$work/tmp/$$hostname-$$target"; \
fi; \
@@ -224,8 +239,8 @@
fi; \
$(SHTOOL) echo -e "%B++ Erasing OpenPKG instance ($(PREFIX))%b"; \
work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
- if [ -d "/ltmp/openpkg-$$hostname-$$target" ]; then \
- tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ if [ -d "$(LTMP)/openpkg-$$hostname-$$target" ]; then \
+ tmp="$(LTMP)/openpkg-$$hostname-$$target"; \
else \
tmp="$$work/tmp/$$hostname-$$target"; \
fi; \
@@ -249,8 +264,8 @@
rm -rf $(WORK)/bin/$$hostname-$$target; \
rm -rf $(WORK)/tmp/$$hostname-$$target; \
work="`$$SHELL -c 'cd $$PWD; cd $(WORK); pwd'`"; \
- if [ -d "/ltmp/openpkg-$$hostname-$$target" ]; then \
- tmp="/ltmp/openpkg-$$hostname-$$target"; \
+ if [ -d "$(LTMP)/openpkg-$$hostname-$$target" ]; then \
+ tmp="$(LTMP)/openpkg-$$hostname-$$target"; \
else \
tmp="$$work/tmp/$$hostname-$$target"; \
fi; \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
