unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf            |    1 
 unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf   |    1 
 unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf        |    1 
 unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf      |    1 
 unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf |    1 
 unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf |    1 
 unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf          |    1 
 unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf            |    1 
 unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf          |    1 
 unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf           |    2 -
 unity/scripts/respin.sh                                              |   18 
+++++++++-
 11 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 909818007b30b7287c510e7c75169abbddb31e6d
Merge: ec8d392... 75e5210...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Wed Feb 25 16:26:19 2009 +0100

    Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
    
    Conflicts:
        unity/scripts/respin.sh

diff --cc unity/scripts/respin.sh
index 1ed5bbc,79208bc..03ddfb7
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@@ -159,10 -169,10 +169,12 @@@ for version in $VERSIONS; d
      for arch in $ARCHES; do
  
          if [ $LIVE -eq 1 ]; then
+             cd ${revisor_cwd}
+ 
              for spin in `${revisor_cmd} --config 
/etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ 
f$version-$arch-" | awk '{print $1}'`; do
  
 +                echo "Creating $spin"
 +
                  datestamp=`date +'%Y%m%d'`
  
                  [ $JUST_LIST -eq 1 ] && echo $spin && continue


commit ec8d3926f094564997c5a2f68df415b994c984ee
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Wed Feb 25 01:17:27 2009 +0100

    Update respin.sh
    
      * Sleep for a little while in between spins (10 seconds)
      * Let stdout now which spin we're creating

diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index abfb7de..1ed5bbc 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -161,6 +161,8 @@ for version in $VERSIONS; do
         if [ $LIVE -eq 1 ]; then
             for spin in `${revisor_cmd} --config 
/etc/revisor-unity/f$version-live-respin.conf --list-models | grep "^ 
f$version-$arch-" | awk '{print $1}'`; do
 
+                echo "Creating $spin"
+
                 datestamp=`date +'%Y%m%d'`
 
                 [ $JUST_LIST -eq 1 ] && echo $spin && continue
@@ -189,6 +191,8 @@ for version in $VERSIONS; do
 
                 sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
                 sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
+
+                sleep 10
             done
         fi
 
@@ -198,6 +202,8 @@ for version in $VERSIONS; do
 
             spin_name="f$version-$arch-respin"
 
+            echo "Creating $spin"
+
             mock -r fedora-$version-$arch clean | tee 
revisor-f$version-$arch-respin.log && \
             mock -r fedora-$version-$arch init | tee -a 
revisor-f$version-$arch-respin.log && \
             mock -r fedora-$version-$arch install $revisor_deps | tee -a 
revisor-f$version-$arch-respin.log && \
@@ -206,6 +212,8 @@ for version in $VERSIONS; do
             echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r 
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
             echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r 
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
 
+            sleep 10
+
             datestamp=`date +'%Y%m%d'`
 
             # Let's make sure we remove the entire directory before we attempt 
a respin.


commit 5cbf5b19814a0a4cae55f63ead6f24832fba5b71
Merge: 392165c... 3f39a07...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Wed Feb 25 01:00:13 2009 +0100

    Merge branch 'master' of git://git.fedorahosted.org/revisor



commit 392165c2fa9e4a03c7fc77665c86d121fe884311
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Tue Feb 24 21:07:34 2009 +0100

    Package not available on ppc

diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 55ede26..abfb7de 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -52,7 +52,7 @@ fi
 revisor_deps="comps-extras createrepo rhpl pykickstart livecd-tools
         anaconda squashfs-tools busybox-anaconda notify-python usermode
         pam python automake intltool gettext desktop-file-utils glib2-devel gcc
-        cobbler koan deltarpm pygtk2-libglade gnome-python2-gconf
+        koan deltarpm pygtk2-libglade gnome-python2-gconf
         system-config-kickstart jigdo livecd-tools python-virtinst git sudo
         spin-kickstarts mock yum-utils"
 


commit efe9566b7d1bb171aa5859bdaa0933c409a4170c
Merge: c473fac... 6cf2d2f...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 23:04:31 2009 +0100

    Merge branch 'master' of git://git.fedorahosted.org/revisor



commit c473facdc2ba8328f3c8a4e0c0808c3ce6b1332a
Merge: 0c0c857... d0afa86...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 22:54:32 2009 +0100

    Merge branch 'master' of git://git.fedorahosted.org/revisor



commit 0c0c85732eb23d3b783c842a5d451ac060263f57
Merge: e1b1335... 17dcab1...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 20:05:33 2009 +0100

    Merge branch 'master' of git://git.fedorahosted.org/revisor



commit e1b1335652b826a99879ab948bc56cad4a8320e4
Merge: 5520b6d... f20ed2c...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 19:16:33 2009 +0100

    Merge branch 'master' of git://git.fedorahosted.org/revisor



commit 5520b6d83eba44e2aa9f275e6b452e1defd95731
Merge: c6f823f... 3202c47...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 17:13:00 2009 +0100

    Merge branch 'master' of git://git.fedorahosted.org/revisor



commit c6f823f9d140c3a1b8243c253c1922ffeea744af
Merge: 39f1cf2... 7a229a7...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 16:42:12 2009 +0100

    Merge branch 'master' of git://git.fedorahosted.org/revisor



commit 39f1cf24fe4fbf4641e6bfa8615f120c7d7e2f67
Merge: 8e22687... 5097518...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 16:41:22 2009 +0100

    Merge branch 'master' of git://git.fedorahosted.org/revisor



commit 8e2268744f4bc297e2095ae5326b85b1000d3719
Merge: 432864e... 5a069d4...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 15:14:04 2009 +0100

    Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor



commit 432864ee8c6b42a35e0f0940b3d76d788dfab342
Merge: 8fb72f9... e530423...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 14:59:18 2009 +0100

    Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor



commit 8fb72f996608b14ec050e7d331f9a1ac132c6583
Merge: 170af85... 4dd2b6d...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 14:46:21 2009 +0100

    Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor



commit 170af85dd94812b8072db046f3f1eca9f1285517
Merge: 68f1f27... 784beca...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Mon Feb 23 13:10:12 2009 +0100

    Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor



commit 68f1f27957abab5b2b4b02f08d0678d001022620
Merge: 235c01e... 3254d2c...
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Fri Feb 20 18:55:51 2009 +0100

    Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor



commit 235c01eeb08d9659b35c9d7e82f448748f4ce78d
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date:   Fri Feb 20 18:54:31 2009 +0100

    Update fedora 10 live respin configuration for x86_64, so that i?86 
packages are excluded

diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-aos-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-broffice.org-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-desktop-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-developer-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
diff --git 
a/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-education-math-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
diff --git 
a/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-electronic-lab-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-games-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-kde-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf
index 33a2a0d..91c75de 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-sugar-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
diff --git a/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf 
b/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
index 33a2a0d..53042e3 100644
--- a/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
+++ b/unity/conf/conf.d/revisor-f10-x86_64-live-xfce-respin.conf
@@ -1,4 +1,5 @@
 [main]
+exclude=*.i?86
 cachedir=-yumcache
 reposdir=
 keepcache=1
@@ -33,7 +34,6 @@ gpgcheck=1
 name=Fedora 10 - x86_64 - Updates
 baseurl=http://localrepo/fedora/updates/10/x86_64/
 
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=x86_64
-exclude=
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora


_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel

Reply via email to