F17 configs: enable fedora-updates-testing, incorporate fedora-updates

As F17 moves towards final, fedora-updates-testing has been disabled
by default. Force-enable it for our pre-release-candidate builds as before.

Also enable the fedora-updates repo, which is currently empty, but will
soon fall into use.

6 files changed, 24 insertions, 18 deletions

diff --git a/examples/f17-xo1.5.ini b/examples/f17-xo1.5.ini
index 231fc23..684ee91 100644
--- a/examples/f17-xo1.5.ini
+++ b/examples/f17-xo1.5.ini
@@ -14,15 +14,16 @@ langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa
 
 [repos]
 fedora_arch=i386
-fedora=fedora,fedora-updates-testing
+fedora=fedora,fedora-updates,fedora-updates-testing
 olpc_publicrpms_1=1,f17
 olpc_publicrpms_2=1,f17-xo1.5
-add_excludes_to=fedora,fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [yumcfg]
 addrepo_1=1,olpc-f17,http://rpmdropbox.laptop.org/f17/
 addrepo_2=1,olpc-f17-xo1.5,http://rpmdropbox.laptop.org/f17-xo1.5/
-add_excludes_to=fedora,fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+force_enable=fedora-updates-testing
 
 [x11]
 
diff --git a/examples/f17-xo1.75.ini b/examples/f17-xo1.75.ini
index 40ee885..43ec6a8 100644
--- a/examples/f17-xo1.75.ini
+++ b/examples/f17-xo1.75.ini
@@ -14,15 +14,16 @@ langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa
 
 [repos]
 fedora_arch=armhfp
-fedora=fedora
+fedora=fedora,fedora-updates,fedora-updates-testing
 olpc_publicrpms_1=1,f17
 olpc_publicrpms_2=1,f17-xo1.75
-add_excludes_to=fedora
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [yumcfg]
 addrepo_1=1,olpc-f17,http://rpmdropbox.laptop.org/f17/
 addrepo_2=1,olpc-f17-xo1.75,http://rpmdropbox.laptop.org/f17-xo1.75/
-add_excludes_to=fedora
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+force_enable=fedora-updates-testing
 
 [x11]
 
diff --git a/examples/f17-xo1.ini b/examples/f17-xo1.ini
index dc7a9ca..8874efb 100644
--- a/examples/f17-xo1.ini
+++ b/examples/f17-xo1.ini
@@ -14,15 +14,16 @@ langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa
 
 [repos]
 fedora_arch=i386
-fedora=fedora,fedora-updates-testing
+fedora=fedora,fedora-updates,fedora-updates-testing
 olpc_publicrpms_1=1,f17
 olpc_publicrpms_2=1,f17-xo1
-add_excludes_to=fedora,fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [yumcfg]
 addrepo_1=1,olpc-f17,http://rpmdropbox.laptop.org/f17/
 addrepo_2=1,olpc-f17-xo1,http://rpmdropbox.laptop.org/f17-xo1/
-add_excludes_to=fedora,fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+force_enable=fedora-updates-testing
 
 [x11]
 
diff --git a/examples/olpc-os-12.1.0-xo1.5.ini b/examples/olpc-os-12.1.0-xo1.5.ini
index 1320011..244cb1c 100644
--- a/examples/olpc-os-12.1.0-xo1.5.ini
+++ b/examples/olpc-os-12.1.0-xo1.5.ini
@@ -14,15 +14,16 @@ langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa
 
 [repos]
 fedora_arch=i386
-fedora=fedora,fedora-updates-testing
+fedora=fedora,fedora-updates,fedora-updates-testing
 olpc_publicrpms_1=1,f17
 olpc_publicrpms_2=1,f17-xo1.5
-add_excludes_to=fedora,fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [yumcfg]
 addrepo_1=1,olpc-f17,http://rpmdropbox.laptop.org/f17/
 addrepo_2=1,olpc-f17-xo1.5,http://rpmdropbox.laptop.org/f17-xo1.5/
-add_excludes_to=fedora,fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+force_enable=fedora-updates-testing
 
 [x11]
 
diff --git a/examples/olpc-os-12.1.0-xo1.75.ini b/examples/olpc-os-12.1.0-xo1.75.ini
index 7ea236a..cf56b7b 100644
--- a/examples/olpc-os-12.1.0-xo1.75.ini
+++ b/examples/olpc-os-12.1.0-xo1.75.ini
@@ -14,15 +14,16 @@ langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa
 
 [repos]
 fedora_arch=armhfp
-fedora=fedora
+fedora=fedora,fedora-updates,fedora-updates-testing
 olpc_publicrpms_1=1,f17
 olpc_publicrpms_2=1,f17-xo1.75
-add_excludes_to=fedora
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [yumcfg]
 addrepo_1=1,olpc-f17,http://rpmdropbox.laptop.org/f17/
 addrepo_2=1,olpc-f17-xo1.75,http://rpmdropbox.laptop.org/f17-xo1.75/
-add_excludes_to=fedora
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+force_enable=fedora-updates-testing
 
 [x11]
 
diff --git a/examples/olpc-os-12.1.0-xo1.ini b/examples/olpc-os-12.1.0-xo1.ini
index 9bec603..ef31004 100644
--- a/examples/olpc-os-12.1.0-xo1.ini
+++ b/examples/olpc-os-12.1.0-xo1.ini
@@ -14,15 +14,16 @@ langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa
 
 [repos]
 fedora_arch=i386
-fedora=fedora,fedora-updates-testing
+fedora=fedora,fedora-updates,fedora-updates-testing
 olpc_publicrpms_1=1,f17
 olpc_publicrpms_2=1,f17-xo1
-add_excludes_to=fedora,fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [yumcfg]
 addrepo_1=1,olpc-f17,http://rpmdropbox.laptop.org/f17/
 addrepo_2=1,olpc-f17-xo1,http://rpmdropbox.laptop.org/f17-xo1/
-add_excludes_to=fedora,fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+force_enable=fedora-updates-testing
 
 [x11]