From c047c95f420ea2be777868c0f5f20cc3809d3ffb Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Wed, 01 Aug 2012 23:36:00 +0000
Subject: rawhide configs: update to F18 dropboxes

and don't force_enable rawhide - its enabled by default.
---
diff --git a/examples/rawhide-xo1.5.ini b/examples/rawhide-xo1.5.ini
index d0f2640..67a9168 100644
--- a/examples/rawhide-xo1.5.ini
+++ b/examples/rawhide-xo1.5.ini
@@ -1,7 +1,7 @@
 [global]
 fedora_release=18
-olpc_version_major=0
-olpc_version_minor=0
+olpc_version_major=12
+olpc_version_minor=2
 olpc_version_release=0
 target_platform=XO-1.5
 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_AF,si,zh_CN,de
@@ -15,17 +15,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=rawhide
-olpc_publicrpms_1=1,f17
-olpc_publicrpms_2=1,f17-xo1.5
+olpc_publicrpms_1=1,f18
+olpc_publicrpms_2=1,f18-xo1.5
 add_excludes_to=rawhide
 
 [custom_packages]
 add_packages=fedora-release-rawhide
 
 [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/
-force_enable=fedora-rawhide
+addrepo_1=1,olpc-f18,http://rpmdropbox.laptop.org/f18/
+addrepo_2=1,olpc-f18-xo1.5,http://rpmdropbox.laptop.org/f18-xo1.5/
 add_excludes_to=fedora-rawhide
 
 [x11]
diff --git a/examples/rawhide-xo1.75.ini b/examples/rawhide-xo1.75.ini
index 4d4e864..cf19c50 100644
--- a/examples/rawhide-xo1.75.ini
+++ b/examples/rawhide-xo1.75.ini
@@ -1,28 +1,31 @@
 [global]
 fedora_release=18
-olpc_version_major=0
-olpc_version_minor=0
+olpc_version_major=12
+olpc_version_minor=2
 olpc_version_release=0
 target_platform=XO-1.75
 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_AF,si,zh_CN,de
 
 [base]
 
+[custom_packages]
+add_packages=fedora-release-rawhide
+
 [xo1_75]
 
 [sd_card_image]
 
 [repos]
 fedora_arch=armhfp
-fedora=fedora,fedora-updates
-olpc_publicrpms_1=1,f14
-olpc_publicrpms_2=1,f14-xo1.75
-add_excludes_to=fedora,fedora-updates
+fedora=rawhide
+olpc_publicrpms_1=1,f18
+olpc_publicrpms_2=1,f18-xo1.75
+add_excludes_to=rawhide
 
 [yumcfg]
-addrepo_1=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
-addrepo_2=1,olpc-f14-xo1.75,http://rpmdropbox.laptop.org/f14-xo1.75/
-add_excludes_to=fedora,fedora-updates
+addrepo_1=1,olpc-f18,http://rpmdropbox.laptop.org/f18/
+addrepo_2=1,olpc-f18-xo1.75,http://rpmdropbox.laptop.org/f18-xo1.75/
+add_excludes_to=fedora-rawhide
 
 [x11]
 
diff --git a/examples/rawhide-xo1.ini b/examples/rawhide-xo1.ini
index 774c35a..f366798 100644
--- a/examples/rawhide-xo1.ini
+++ b/examples/rawhide-xo1.ini
@@ -1,7 +1,7 @@
 [global]
 fedora_release=18
-olpc_version_major=0
-olpc_version_minor=0
+olpc_version_major=12
+olpc_version_minor=2
 olpc_version_release=0
 target_platform=XO-1
 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_AF,si,zh_CN,de
@@ -15,17 +15,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=rawhide
-olpc_publicrpms_1=1,f17
-olpc_publicrpms_2=1,f17-xo1
+olpc_publicrpms_1=1,f18
+olpc_publicrpms_2=1,f18-xo1
 add_excludes_to=rawhide
 
 [custom_packages]
 add_packages=fedora-release-rawhide
 
 [yumcfg]
-addrepo_1=1,olpc-f17,http://rpmdropbox.laptop.org/f17/
-addrepo_2=1,olpc-f17-xo1,http://rpmdropbox.laptop.org/f17-xo1/
-force_enable=fedora-rawhide
+addrepo_1=1,olpc-f18,http://rpmdropbox.laptop.org/f18/
+addrepo_2=1,olpc-f18-xo1,http://rpmdropbox.laptop.org/f18-xo1/
 add_excludes_to=fedora-rawhide
 
 [x11]
--
cgit v0.9.1