Fixing problem with bind mounted portage and final rsync on tinderbox target and...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@849 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index b430a809f343cd0be38e99dc3010fc9a51ec5715..37dc5b251cf7dc504b69a72eb1acdec03b6be66f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.341 2005/10/06 20:55:42 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.342 2005/10/06 20:56:54 wolf31o2 Exp $
+
+  06 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/tinderbox/tinderbox-chroot.sh,
+  targets/tinderbox/tinderbox-controller.sh:
+  Fixing problem with bind mounted portage and final rsync on tinderbox target
+  and adding additional logging.
 
   06 Oct 2005; Eric Edgar <rocket@gentoo.org> modules/tinderbox_target.py:
   Stop tinderbox from trying to create a tarball of itself

diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index 4d4b207a766c0055eea3fc3a681e70b1586b1b83..ca6d5be6086e156f18241db38a00d96c1a02e125 100755 (executable)
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.12 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.13 2005/10/06 20:56:54 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -35,7 +35,9 @@ do
                        read -s -n 1
                fi
        fi
-       
+
+       mkdir -p /tmp/packages/$x
+       export PORT_LOGDIR="/tmp/packages/$x"
        emerge --usepkg --buildpkg $x
        
        if [ "$?" != "0" ]
@@ -45,5 +47,5 @@ do
                echo "$x" >> /tmp/tinderbox.log
        fi
        echo "Syncing from original pristine tinderbox snapshot..."
-       rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude "/usr/portage/*" /tmp/rsync-bak/ /
+       rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude "/usr/portage/" /tmp/rsync-bak/ /
 done

diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index b83dccc63d63f01e28b5eaed04f089035885050e..c6075490ca02b403cd2f9060d9cea2ecd3fda442 100755 (executable)
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-controller.sh,v 1.3 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-controller.sh,v 1.4 2005/10/06 20:56:54 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -12,7 +12,7 @@ case $1 in
        ;;
 
        preclean)
-               #exec_in_chroot ${clst_sharedir}/targets/grp/tinderbox-preclean-chroot.sh
+               #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
                delete_from_chroot /tmp/chroot-functions.sh
        ;;