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:05:55
Branch: HEAD Handle: 2003011111055400
Modified files:
openpkg-re release.txt src2make.pl
Log:
flush pending changes from OpenPKG 1.1 release engineering process
from Aug-2002
Summary:
Revision Changes Path
1.24 +6 -1 openpkg-re/release.txt
1.44 +16 -7 openpkg-re/src2make.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/release.txt
============================================================================
$ cvs diff -u -r1.23 -r1.24 release.txt
--- openpkg-re/release.txt 28 Aug 2002 12:07:52 -0000 1.23
+++ openpkg-re/release.txt 11 Jan 2003 11:05:54 -0000 1.24
@@ -76,7 +76,12 @@
# cvs ci -m "bump release numbers for OpenPKG N.M"
# roll all source RPMs
- $ /cw/bin/rpm -bs --nodeps */*.spec
+ $ /cw/bin/rpm \
+ -bs --nodeps \
+ --define "_specdir `pwd`/%{name}" \
+ --define "_srcrpmdir `pwd`/../release/src/master/" \
+ */*.spec
+ # FIXME: --norestriction ?!
# generate binary build/install Makefiles
# there exists a script ~/openpkg/re/src2make.sh also
@@ .
patch -p0 <<'@@ .'
Index: openpkg-re/src2make.pl
============================================================================
$ cvs diff -u -r1.43 -r1.44 src2make.pl
--- openpkg-re/src2make.pl 30 Dec 2002 22:10:49 -0000 1.43
+++ openpkg-re/src2make.pl 11 Jan 2003 11:05:54 -0000 1.44
@@ -301,8 +301,8 @@
$str =~ s|,\s+$||s;
return $str;
}
- &verbose(" build requirement: ".&reqstr($pkg_breq));
- &verbose(" install requirement: ".&reqstr($pkg_ireq));
+ #&verbose(" build requirement: ".&reqstr($pkg_breq));
+ #&verbose(" install requirement: ".&reqstr($pkg_ireq));
# remember dependencies in graphs:
# this -> dep1, ..., this -> depN
@@ -444,7 +444,9 @@
$MF .= "SHELL = /bin/sh\n" .
"\n" .
"# configuration (set by entrance Makefile)\n" .
+ "HOSTNAME = *\n" .
"PLATFORM = *\n" .
+ "LOG = *\n" .
"SRC = *\n" .
"DST = *\n" .
"TMP = *\n" .
@@ -457,10 +459,10 @@
"\n" .
"# transitive make(1) handling\n" .
"MAKE_TRANS = MAKEFLAGS=\"\" \$(MAKE) \$(MFLAGS) -f Makefile.rules \\\n" .
- " PLATFORM=\"\$(PLATFORM)\" \\\n" .
+ " HOSTNAME=\"\$(HOSTNAME)\" PLATFORM=\"\$(PLATFORM)\" \\\n" .
" SSH_AUTH_SOCK=\"\$\$SSH_AUTH_SOCK\" \\\n" .
" TERM_B=\"\$(TERM_B)\" TERM_N=\"\$(TERM_N)\" \\\n" .
- " SRC=\"\$(SRC)\" DST=\"\$(DST)\" TMP=\"\$(TMP)\"\\\n" .
+ " LOG=\"\$(LOG)\" SRC=\"\$(SRC)\" DST=\"\$(DST)\"
TMP=\"\$(TMP)\"\\\n" .
" RPM=\"\$(RPM)\" RPM_FLAGS=\"\$(RPM_FLAGS)\" \\\n" .
" EXEC_ROOT=\"\$(EXEC_ROOT)\" EXEC_USER=\"\$(EXEC_USER)\"\n" .
"\n" .
@@ -667,7 +669,7 @@
# generate build command
$MF .= "\t-\@echo \"\$(TERM_B):::: Building $pkg ::::\$(TERM_N)\"\n";
- $MF .= "\tcd \$(SRC) && \$(RPM_RD) --rebuild $pkg.src.rpm\n";
+ $MF .= "\tcd \$(SRC) && (echo \"Build Time: \`date\`\"; \$(RPM_RD) --rebuild
$pkg.src.rpm 2>&1) | tee \$(LOG)/$pkg.log.\$(HOSTNAME).\$(PLATFORM)\n";
# generate build epilog (installation of dependencies)
if (not $nouninstall) {
@@ -748,10 +750,12 @@
"PREFIX = $prefix\n" .
"USER = $user\n" .
"GROUP = $group\n" .
+ "HOSTNAME = auto\n" .
"PLATFORM = auto\n" .
"\n" .
"# configuration: OpenPKG package areas\n" .
"TMP = /tmp/openpkg\n" .
+ "LOG = .\n" .
"SRC = .\n" .
"DST = .\n" .
"\n" .
@@ -781,6 +785,10 @@
"\tif [ \".\$\$PLATFORM\" = .auto ]; then \\\n" .
"\t PLATFORM=\"\`\$(RPM) --eval '%{l_target}-%{l_location}'\`\"; \\\n" .
"\tfi; \\\n" .
+ "\tHOSTNAME=\"\$(HOSTNAME)\"; \\\n" .
+ "\tif [ \".\$\$HOSTNAME\" = .auto ]; then \\\n" .
+ "\t HOSTNAME=\"\`hostname | sed 's;\\..*\$\$;;'\`\"; \\\n" .
+ "\tfi; \\\n" .
"\tENV_PATH=\"\$(ENV_PATH)\"; \\\n" .
"\tENV_LDLP=\"\$(ENV_LDLP)\"; \\\n" .
"\tSYSTEM=\"`(uname -s) 2>/dev/null || echo unknown`\"; \\\n" .
@@ -823,6 +831,7 @@
"\tfi; \\\n" .
"\trm -rf \$(TMP)/SRC/* 2>/dev/null || true; \\\n" .
"\trm -rf \$(TMP)/TMP/* 2>/dev/null || true; \\\n" .
+ "\tLOG=\"\`cd \$\(LOG) && pwd\`\"; \\\n" .
"\tSRC=\"\`cd \$\(SRC) && pwd\`\"; \\\n" .
"\tDST=\"\`cd \$\(DST) && pwd\`\"; \\\n" .
"\tTMP=\"\`cd \$\(TMP) && pwd\`\"; \\\n" .
@@ -840,10 +849,10 @@
"\t USER=\"\$\$USER\" LOGNAME=\"\$\$LOGNAME\" \\\n" .
"\t PATH=\"\$\$ENV_PATH\" LD_LIBRARY_PATH=\"\$\$ENV_LDLP\" \\\n" .
"\t \$(MAKE) \$(MFLAGS) -f Makefile.rules \\\n" .
- "\t PLATFORM=\"\$\$PLATFORM\" \\\n" .
+ "\t HOSTNAME=\"\$\$HOSTNAME\" PLATFORM=\"\$\$PLATFORM\" \\\n" .
"\t SSH_AUTH_SOCK=\"\$\$SSH_AUTH_SOCK\" \\\n" .
"\t TERM_B=\"\$\$TERM_B\" TERM_N=\"\$\$TERM_N\" \\\n" .
- "\t SRC=\"\$\$SRC\" DST=\"\$\$DST\" TMP=\"\$\$TMP\" \\\n" .
+ "\t LOG=\"\$\$LOG\" SRC=\"\$\$SRC\" DST=\"\$\$DST\" TMP=\"\$\$TMP\"
\\\n" .
"\t RPM=\"\$(RPM)\" RPM_FLAGS=\"\$(RPM_FLAGS)\" \\\n" .
"\t EXEC_ROOT=\"\$(EXEC_ROOT)\" EXEC_USER=\"\$(EXEC_USER)\" \\\n" .
"\t \$\@ 2>&1 | tee Makefile.log.\$\$PLATFORM\n" .
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
