Update build configs for F16

6 files changed, 14 insertions, 356 deletions

diff --git a/examples/f14-xo1.75.ini b/examples/f14-xo1.75.ini
deleted file mode 100644
index 1ad1344..0000000
--- a/examples/f14-xo1.75.ini
+++ /dev/null
@@ -1,126 +0,0 @@
-[global]
-fedora_release=14
-olpc_version_major=11
-olpc_version_minor=3
-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
-modules=
-	base,
-	xo1_75,
-	buildnr_from_file,
-	yumcfg,
-	sd_card_image,
-	repos,
-	x11,
-	sugar,
-	sugarlabs_activities,
-	sugar_activities_extra,
-	gnome
-
-[sd_card_image]
-; 4GB image
-size_1=3865470566,zd4
-
-[repos]
-fedora_arch=arm
-fedora=fedora,fedora-updates
-olpc_publicrpms_1=1,f14
-olpc_publicrpms_2=1,f14-xo1.75
-add_excludes_to=fedora,fedora-updates
-
-[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
-
-[sugar]
-favorites_view_add=
-	org.sugarlabs.InfoSlicer,
-	org.sugarlabs.IRC,
-	org.laptop.physics,
-	org.laptop.Words,
-	org.laptop.community.TypingTurtle,
-	org.gnome.Labyrinth,
-	org.laptop.sugar.GetBooksActivity,
-	org.laptop.WikipediaActivity,
-	org.laptop.WikipediaActivityEN,
-	org.laptop.StopWatchActivity,
-	org.laptop.RecordActivity,
-	org.laptop.community.Finance,
-	tv.alterna.Clock,
-	org.eq.FotoToon,
-	org.sugarlabs.AbacusActivity,
-	org.sugarlabs.PortfolioActivity
-favorites_view_del=
-	org.laptop.sugar.ReadActivity,
-	org.laptop.TamTamSynthLab
-protected_activities=
-	org.laptop.WebActivity,
-	org.laptop.Terminal,
-	org.laptop.Log,
-	org.laptop.AbiWordActivity,
-	org.laptop.sugar.ReadActivity,
-	org.laptop.ImageViewerActivity,
-	org.laptop.RecordActivity
-
-[sugarlabs_activities]
-sugar_version=0.92
-experimental=1
-activities=org.laptop.HelpActivity,
-	org.laptop.AbiWordActivity,
-	org.laptop.Oficina,
-	org.laptop.TamTamSynthLab,
-	org.laptop.TamTamJam,
-	org.laptop.TamTamEdit,
-	org.laptop.TamTamMini,
-	org.laptop.Chat,
-	org.laptop.Pippy,
-	org.laptop.TurtleArtActivity,
-	org.laptop.Calculate,
-	org.laptop.Memorize,
-	com.jotaro.ImplodeActivity,
-	vu.lux.olpc.Speak,
-	org.laptop.physics,
-	org.laptop.sugar.Jukebox,
-	org.gnome.Labyrinth,
-	org.laptop.ImageViewerActivity,
-	org.laptop.community.Finance,
-	org.laptop.AcousticMeasure,
-	org.laptop.WebActivity,
-	org.vpri.EtoysActivity,
-	org.laptop.MeasureActivity,
-	vu.lux.olpc.Maze,
-	com.garycmartin.Moon,
-	org.laptop.Terminal,
-	org.laptop.Log,
-	org.laptop.community.TypingTurtle,
-	org.sugarlabs.InfoSlicer,
-	org.laptop.StopWatchActivity,
-	org.laptop.sugar.GetBooksActivity,
-	org.laptop.sugar.ReadActivity,
-	org.laptop.RecordActivity,
-	org.laptop.WikipediaActivity,
-	org.laptop.WikipediaActivityEN,
-	org.sugarlabs.AbacusActivity,
-	org.eq.FotoToon,
-	tv.alterna.Clock,
-	com.laptop.Ruler,
-	org.sugarlabs.HelloWorld,
-	org.laptop.Words
-
-[sugar_activities_extra]
-url_1=http://dev.laptop.org/~reuben/scratch-19.xo
-url_6=http://dev.laptop.org/~gonzalo/Biology-10.xol
-url_7=http://wiki.laptop.org/images/7/77/Wikibooks-8.xol
-url_8=http://wiki.laptop.org/images/5/5e/NatureImages-8.xol
-url_9=http://wiki.laptop.org/images/9/9e/JamendoMusic-5.xol
-url_10=http://wiki.laptop.org/images/0/05/TranslationDictionary-8.xol
-url_11=http://wiki.laptop.org/images/3/34/ICDL-8.xol
-url_12=http://wiki.laptop.org/images/a/af/WorldFactbookMaps-6.xol
-url_13=http://wiki.laptop.org/images/f/fe/WikisliceChemistry-en-8.xol
-url_14=http://dev.laptop.org/~sj/WorldDigitalLibrary-5.xol
-
-[buildnr_from_file]
-path=latestbuild
-
diff --git a/examples/f14-xo1.5.ini b/examples/f16-xo1.5.ini
index 7cb735c..7fa83d4 100644
--- a/examples/f14-xo1.5.ini
+++ b/examples/f16-xo1.5.ini
@@ -1,7 +1,7 @@
 [global]
-fedora_release=14
-olpc_version_major=11
-olpc_version_minor=3
+fedora_release=16
+olpc_version_major=0
+olpc_version_minor=0
 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
@@ -27,13 +27,13 @@ size_2=1932735283,zd2
 [repos]
 fedora_arch=i386
 fedora=fedora,fedora-updates,fedora-updates-testing
-olpc_publicrpms_1=1,f14
-olpc_publicrpms_2=1,f14-xo1.5
+olpc_publicrpms_1=1,f16
+olpc_publicrpms_2=1,f16-xo1.5
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [yumcfg]
-addrepo_1=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
-addrepo_2=1,olpc-f14-xo1.5,http://rpmdropbox.laptop.org/f14-xo1.5/
+addrepo_1=1,olpc-f16,http://rpmdropbox.laptop.org/f16/
+addrepo_2=1,olpc-f16-xo1.5,http://rpmdropbox.laptop.org/f16-xo1.5/
 force_enable=fedora-updates-testing
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
@@ -68,7 +68,6 @@ protected_activities=
 	org.laptop.RecordActivity
 
 [sugarlabs_activities]
-sugar_version=0.92
 experimental=1
 activities=org.laptop.HelpActivity,
 	org.laptop.AbiWordActivity,
diff --git a/examples/f14-xo1.ini b/examples/f16-xo1.ini
index c291469..44bff15 100644
--- a/examples/f14-xo1.ini
+++ b/examples/f16-xo1.ini
@@ -1,7 +1,7 @@
 [global]
-fedora_release=14
-olpc_version_major=11
-olpc_version_minor=3
+fedora_release=16
+olpc_version_major=0
+olpc_version_minor=0
 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
@@ -21,13 +21,13 @@ modules=
 [repos]
 fedora_arch=i386
 fedora=fedora,fedora-updates,fedora-updates-testing
-olpc_publicrpms_1=1,f14
-olpc_publicrpms_2=1,f14-xo1
+olpc_publicrpms_1=1,f16
+olpc_publicrpms_2=1,f16-xo1
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [yumcfg]
-addrepo_1=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
-addrepo_2=1,olpc-f14-xo1,http://rpmdropbox.laptop.org/f14-xo1/
+addrepo_1=1,olpc-f16,http://rpmdropbox.laptop.org/f16/
+addrepo_2=1,olpc-f16-xo1,http://rpmdropbox.laptop.org/f16-xo1/
 force_enable=fedora-updates-testing
 add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
@@ -50,7 +50,6 @@ protected_activities=
 	org.laptop.RecordActivity
 
 [sugarlabs_activities]
-sugar_version=0.92
 experimental=1
 activities=org.laptop.AbiWordActivity,
 	org.laptop.Oficina,
diff --git a/examples/olpc-os-11.3.0-xo1.5.ini b/examples/olpc-os-11.3.0-xo1.5.ini
deleted file mode 100644
index 067dc23..0000000
--- a/examples/olpc-os-11.3.0-xo1.5.ini
+++ /dev/null
@@ -1,78 +0,0 @@
-[global]
-fedora_release=14
-olpc_version_major=11
-olpc_version_minor=3
-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
-modules=
-	base,
-	xo1_5,
-	buildnr_from_file,
-	yumcfg,
-	sd_card_image,
-	usb_update,
-	repos,
-	x11,
-	sugar,
-	sugar_activity_group,
-	gnome
-
-[sd_card_image]
-; 8GB image
-size_3=7730941132,zd8
-; 4GB image
-size_1=3865470566,zd4
-; 2GB image
-size_2=1932735283,zd2
-
-[repos]
-fedora_arch=i386
-olpc_frozen_1=0,koji.dist-f14-i686
-olpc_frozen_2=0,koji.dist-f14-i686-updates-11.3.0
-olpc_frozen_3=1,local.11.3.0
-olpc_frozen_4=1,local.11.3.0-xo1.5
-add_excludes_to=koji.dist-f14-i686,koji.dist-f14-i686-updates-11.3.0
-
-[yumcfg]
-addrepo_1=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
-addrepo_2=1,olpc-f14-xo1.5,http://rpmdropbox.laptop.org/f14-xo1.5/
-force_enable=fedora-updates-testing
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
-
-[sugar]
-favorites_view_add=
-	org.sugarlabs.InfoSlicer,
-	org.sugarlabs.IRC,
-	org.laptop.physics,
-	org.laptop.Words,
-	org.laptop.community.TypingTurtle,
-	org.gnome.Labyrinth,
-	org.laptop.sugar.GetBooksActivity,
-	org.laptop.WikipediaActivity,
-	org.laptop.WikipediaActivityEN,
-	org.laptop.StopWatchActivity,
-	org.laptop.RecordActivity,
-	org.laptop.community.Finance,
-	tv.alterna.Clock,
-	org.eq.FotoToon,
-	org.sugarlabs.AbacusActivity,
-	org.sugarlabs.PortfolioActivity
-favorites_view_del=
-	org.laptop.sugar.ReadActivity,
-	org.laptop.TamTamSynthLab
-protected_activities=
-	org.laptop.WebActivity,
-	org.laptop.Terminal,
-	org.laptop.Log,
-	org.laptop.AbiWordActivity,
-	org.laptop.sugar.ReadActivity,
-	org.laptop.ImageViewerActivity,
-	org.laptop.RecordActivity
-
-[sugar_activity_group]
-url=http://wiki.laptop.org/go/Activities/G1G1
-
-[buildnr_from_file]
-path=latestbuild
-
diff --git a/examples/olpc-os-11.3.0-xo1.75.ini b/examples/olpc-os-11.3.0-xo1.75.ini
deleted file mode 100644
index 8c28b24..0000000
--- a/examples/olpc-os-11.3.0-xo1.75.ini
+++ /dev/null
@@ -1,73 +0,0 @@
-[global]
-fedora_release=14
-olpc_version_major=11
-olpc_version_minor=3
-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
-modules=
-	base,
-	xo1_75,
-	buildnr_from_file,
-	yumcfg,
-	sd_card_image,
-	usb_update,
-	repos,
-	x11,
-	sugar,
-	sugar_activity_group,
-	gnome
-
-[sd_card_image]
-; 4GB image
-size_1=3865470566,zd4
-
-[repos]
-fedora_arch=arm
-olpc_frozen_1=0,koji.dist-f14-armv5tel
-olpc_frozen_2=0,koji.dist-f14-armv5tel-updates-11.3.0
-olpc_frozen_3=1,local.11.3.0
-olpc_frozen_4=1,local.11.3.0-xo1.75
-add_excludes_to=koji.dist-f14-armv5tel,koji.dist-f14-armv5tel-updates-11.3.0
-
-[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
-
-[sugar]
-favorites_view_add=
-	org.sugarlabs.InfoSlicer,
-	org.sugarlabs.IRC,
-	org.laptop.physics,
-	org.laptop.Words,
-	org.laptop.community.TypingTurtle,
-	org.gnome.Labyrinth,
-	org.laptop.sugar.GetBooksActivity,
-	org.laptop.WikipediaActivity,
-	org.laptop.WikipediaActivityEN,
-	org.laptop.StopWatchActivity,
-	org.laptop.RecordActivity,
-	org.laptop.community.Finance,
-	tv.alterna.Clock,
-	org.eq.FotoToon,
-	org.sugarlabs.AbacusActivity,
-	org.sugarlabs.PortfolioActivity
-favorites_view_del=
-	org.laptop.sugar.ReadActivity,
-	org.laptop.TamTamSynthLab
-protected_activities=
-	org.laptop.WebActivity,
-	org.laptop.Terminal,
-	org.laptop.Log,
-	org.laptop.AbiWordActivity,
-	org.laptop.sugar.ReadActivity,
-	org.laptop.ImageViewerActivity,
-	org.laptop.RecordActivity
-
-[sugar_activity_group]
-url=http://wiki.laptop.org/go/Activities/G1G1
-
-[buildnr_from_file]
-path=latestbuild
-
diff --git a/examples/olpc-os-11.3.0-xo1.ini b/examples/olpc-os-11.3.0-xo1.ini
deleted file mode 100644
index d80c3ce..0000000
--- a/examples/olpc-os-11.3.0-xo1.ini
+++ /dev/null
@@ -1,63 +0,0 @@
-[global]
-fedora_release=14
-olpc_version_major=11
-olpc_version_minor=3
-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
-modules=
-	base,
-	xo1,
-	buildnr_from_file,
-	yumcfg,
-	jffs2_image,
-	usb_update,
-	repos,
-	x11,
-	powerd,
-	sugar,
-	sugar_activity_group,
-	gnome
-
-[repos]
-fedora_arch=i386
-olpc_frozen_1=0,koji.dist-f14-i686
-olpc_frozen_2=0,koji.dist-f14-i686-updates-11.3.0
-olpc_frozen_3=1,local.11.3.0
-olpc_frozen_4=1,local.11.3.0-xo1
-add_excludes_to=koji.dist-f14-i686,koji.dist-f14-i686-updates-11.3.0
-
-[yumcfg]
-addrepo_1=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
-addrepo_2=1,olpc-f14-xo1,http://rpmdropbox.laptop.org/f14-xo1/
-force_enable=fedora-updates-testing
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
-
-[sugar]
-favorites_view_add=
-	tv.alterna.Clock,
-	org.eq.FotoToon,
-	org.sugarlabs.AbacusActivity,
-	org.sugarlabs.PortfolioActivity
-favorites_view_del=
-	org.laptop.sugar.ReadActivity,
-	org.laptop.TamTamSynthLab
-protected_activities=
-	org.laptop.WebActivity,
-	org.laptop.Terminal,
-	org.laptop.Log,
-	org.laptop.AbiWordActivity,
-	org.laptop.sugar.ReadActivity,
-	org.laptop.ImageViewerActivity,
-	org.laptop.RecordActivity
-
-[sugar_activity_group]
-url=http://wiki.laptop.org/go/Activities/G1G1Lite
-
-[buildnr_from_file]
-path=latestbuild
-
-; still too many open blockers for XO-1 idle suspend to work well
-[powerd]
-enable_idle_suspend=0
-