OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 21-Sep-2006 17:25:36
Branch: HEAD Handle: 2006092116253600
Modified files:
openpkg-tools/cmd bf-mk.pl
Log:
introduce support for master/slave relationship with no dependency to
NFS
Summary:
Revision Changes Path
1.34 +18 -0 openpkg-tools/cmd/bf-mk.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/bf-mk.pl
============================================================================
$ cvs diff -u -r1.33 -r1.34 bf-mk.pl
--- openpkg-tools/cmd/bf-mk.pl 21 Sep 2006 15:24:32 -0000 1.33
+++ openpkg-tools/cmd/bf-mk.pl 21 Sep 2006 15:25:36 -0000 1.34
@@ -521,6 +521,10 @@
target="%{shared.folder}/src/$HOST-$ARCH-$OS"
%{slave.cp} $source/Makefile* $target/
%{slave.rm} -f $target/*.src.rpm
+ if [ ".%{slave.remote}" != . ]; then
+ echo "downloading sources from remote master
%{slave.remote}/src/master"
+ %{slave.rsync} -ar %{slave.remote}/src/master
"%{shared.folder}/src/$HOST-$ARCH-$OS" #FIXME --delete
+ fi
for srpm in `cd $source && ls -1 *.src.rpm | sort`; do
%{slave.ln} $source/$srpm $target/
done
@@ -569,6 +573,13 @@
$package \
)
done
+
+ if [ ".%{slave.remote}" = . ]; then
+ echo "uploading binaries to remote master
%{slave.remote}/dst/$HOST-$ARCH-$OS"
+ %{slave.rsync} -ar "%{shared.folder}/dst/$HOST-$ARCH-$OS"
"%{slave.remote}/dst/$HOST-$ARCH-$OS/" #FIXME --delete
+ echo "uploading logs to remote master
%{slave.remote}/dst/$HOST-$ARCH-$OS"
+ %{slave.rsync} -ar "%{shared.folder}/log/$HOST-$ARCH-$OS"
"%{slave.remote}/log/$HOST-$ARCH-$OS/" #FIXME --delete
+ fi
}
cmd_support ()
@@ -884,11 +895,18 @@
ln "ln";
make "nice -20 make";
rm "rm";
+ rsync "%{prefix}/bin/rsync -v";
sed "%{prefix}/bin/sed";
sh "/bin/sh";
ssh "%{prefix}/bin/ssh";
shtool "%{prefix}/bin/shtool";
bfdb "%{slave.ssh} [EMAIL PROTECTED] %{master.bfdb}";
+
+ # Remote location where slave pulls sources from and pushes binaries
and logs to
+ # Keep empty for local machine and local network (NFS) setups
+ # RE using ""
+ #
+ remote "[EMAIL PROTECTED]:%{shared.folder}"
};
workbench {
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
