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: 26-Sep-2006 13:56:10
Branch: HEAD Handle: 2006092612561000
Modified files:
openpkg-tools/cmd bf-mk.pl
Log:
improve environment handling, ssh/rsync must be in PATH for remote
slaves
Summary:
Revision Changes Path
1.38 +11 -2 openpkg-tools/cmd/bf-mk.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/bf-mk.pl
============================================================================
$ cvs diff -u -r1.37 -r1.38 bf-mk.pl
--- openpkg-tools/cmd/bf-mk.pl 22 Sep 2006 08:02:07 -0000 1.37
+++ openpkg-tools/cmd/bf-mk.pl 26 Sep 2006 11:56:10 -0000 1.38
@@ -382,6 +382,16 @@
if [ ".$HOME" != ".%{shared.folder}" ]; then
echo ".bashrc:ERROR: HOME does not match %{shared.folder}"
fi
+if [ -x "%{slave.openpkg}" ]; then
+ eval `"%{slave.openpkg}" rc --eval all env`
+ export PS1="[EMAIL PROTECTED] | %{slave.sed} -e 's;\..*$;;'`\$ "
+else
+ if [ -x "%{master.openpkg}" ]; then
+ eval `"%{master.openpkg}" rc --eval all env`
+ export PS1="[EMAIL PROTECTED] | %{master.sed} -e 's;\..*$;;'`\$ "
+ alias bf=%{master.ssh}
+ fi
+fi
export PATH=%{shared.folder}/bin:$PATH
unset TMOUT
EOT
@@ -393,8 +403,6 @@
my ($cfg) = @_;
my $txt = <<'EOT';
. .bashrc
-export PS1="[EMAIL PROTECTED] | %{slave.sed} -e 's;\..*$;;'`\$ "
-alias bf=%{master.ssh}
echo " Welcome to the OpenPKG build farm %{shared.folder}"
echo ""
echo " connect to build-farm on slave via ssh(1)"
@@ -888,6 +896,7 @@
# RE using OpenPKG instance at "/usr/opkg"
#
prefix "/bf/driver";
+ openpkg "%{prefix}/bin/openpkg";
cp "cp";
gcc "%{prefix}/bin/gcc";
hostname "%{prefix}/bin/ghostname";
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
