Add olpc frozen repos

3 files changed, 65 insertions, 31 deletions

diff --git a/config/dextrose3-common.ini b/config/dextrose3-common.ini
index d8d2073..43f5d57 100644
--- a/config/dextrose3-common.ini
+++ b/config/dextrose3-common.ini
@@ -2,7 +2,7 @@
 ;
 
 [DEFAULT]
-dx3_common_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
+dx3_common_langs=en_US,en_AU,en_GB,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
 dx3_common_modules=
 	base,
 	bootanim,
@@ -24,9 +24,11 @@ dx3_common_packages_add=
 ;	dextrose-updater,
 ; remove ds-backup-client 
 	sugar-client,
-	gstreamer-plugins-bad,
-	gstreamer-plugins-ugly,
-	gstreamer-ffmpeg,
+; FIXME Freeworld pkgs not available for armv5tel
+;	gstreamer-plugins-bad,
+;	gstreamer-plugins-ugly,
+;	gstreamer-ffmpeg,
+
 	hunspell-es,
 	hunspell-pt,
 	ipython,
@@ -37,11 +39,14 @@ dx3_common_packages_add=
 	telepathy-idle,
 	telepathy-sofiasip,
 	x11vnc,
+
 ; accessibility packages
-	ax,
-	CapitalFont,
-	FlatbedCursors,
-	magnifier-Ceibal,
+; FIXME Freeworld pkgs not available for armv5tel
+;	ax,
+;	CapitalFont,
+;	FlatbedCursors,
+;	magnifier-Ceibal,
+
 ; temporary workaround for yum pulling in the wrong versions of Sugar packages
 ; first and disregarding the dependencies of the DX3 versions of Sugar.
 	python-xlib,
@@ -49,30 +54,24 @@ dx3_common_packages_add=
 ; Wasn't being picked automatically unlike previous builds	
 	chkconfig,
 	sugar-hidden-network-connect,
+; sl#3285
+	rsyslog,
+	cronie,
 
 [global]
 fedora_release=14
 olpc_version_major=11
 olpc_version_minor=3
-olpc_version_release=0
+olpc_version_release=1
 image_name=dx3ng%%03d
 
-[sd_card_image]
-; 4GB image
-size_1=3865470566
-; 2GB image
-;size_2=1932735283,2gb
-keep_disk_image=1
-compress_disk_image=1
 
 [repos]
-fedora_arch=i386
-fedora=fedora,fedora-updates,fedora-updates-testing
-olpc_publicrpms_1=1,f14
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
-custom_repo_1=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
-custom_repo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
-custom_repo_3=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-next/i386/os
+olpc_frozen_1=1,local.11.3.1
+
+;fedora=fedora,fedora-updates,fedora-updates-testing
+;olpc_publicrpms_1=1,f14
+;add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 ;custom_repo_3=1,upstream-cherries,http://download.sugarlabs.org/dextrose/testing/dx3/upstream-cherries/i386/os
 
 [custom_packages]
@@ -110,13 +109,8 @@ del_packages=
 
 
 [yumcfg]
-addrepo_1=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
-addrepo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
-addrepo_3=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
-addrepo_4=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-next/i386/os
+addrepo_1=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
 ;addrepo_4=1,upstream-cherries,http://download.sugarlabs.org/dextrose/testing/dx3/upstream-cherries/i386/os
-force_enable=fedora-updates-testing
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [sugar]
 favorites_view_del=
diff --git a/config/dextrose3-xo1-common.ini b/config/dextrose3-xo1-common.ini
index 4872216..dac1201 100644
--- a/config/dextrose3-xo1-common.ini
+++ b/config/dextrose3-xo1-common.ini
@@ -11,10 +11,30 @@ target_platform=XO-1
 enable_idle_suspend=0
 
 [sd_card_image]
+; 4GB image
+size_1=3865470566
+; 2GB image
+;size_2=1932735283,2gb
+keep_disk_image=1
+compress_disk_image=1
 make_zd=0
 
 [repos]
-olpc_publicrpms_2=1,f14-xo1
+fedora_arch=i386
+olpc_frozen_2=0,koji.dist-f14-i686
+olpc_frozen_3=0,koji.dist-f14-i686-updates-11.3.1
+olpc_frozen_4=1,local.11.3.1-xo1
+add_excludes_to=koji.dist-f14-i686,koji.dist-f14-i686-updates-11.3.1
+custom_repo_1=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
+custom_repo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
+custom_repo_3=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-next/i386/os
+
+;olpc_publicrpms_2=1,f14-xo1
 
 [yumcfg]
+addrepo_2=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
+addrepo_3=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
+addrepo_4=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-next/i386/os
 addrepo_5=1,olpc-f14-xo1,http://rpmdropbox.laptop.org/f14-xo1/
+force_enable=fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
diff --git a/config/dextrose3-xo1.5-common.ini b/config/dextrose3-xo1.5-common.ini
index 283d5e7..f733dbc 100644
--- a/config/dextrose3-xo1.5-common.ini
+++ b/config/dextrose3-xo1.5-common.ini
@@ -10,10 +10,30 @@ target_platform=XO-1.5
 enable_idle_suspend=1
 
 [sd_card_image]
+; 4GB image
+size_1=3865470566
+; 2GB image
+;size_2=1932735283,2gb
+keep_disk_image=1
+compress_disk_image=1
 make_zd=1
 
 [repos]
-olpc_publicrpms_2=1,f14-xo1.5
+fedora_arch=i386
+olpc_frozen_2=0,koji.dist-f14-i686
+olpc_frozen_3=0,koji.dist-f14-i686-updates-11.3.1
+olpc_frozen_4=1,local.11.3.1-xo1.5
+add_excludes_to=koji.dist-f14-i686,koji.dist-f14-i686-updates-11.3.1
+custom_repo_1=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
+custom_repo_2=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
+custom_repo_3=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-next/i386/os
+
+;olpc_publicrpms_2=1,f14-xo1.5
 
 [yumcfg]
+addrepo_2=1,dextrose,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
+addrepo_3=1,dextrose-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
+addrepo_4=1,dextrose-next,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-next/i386/os
 addrepo_5=1,olpc-f14-xo1,http://rpmdropbox.laptop.org/f14-xo1.5/
+force_enable=fedora-updates-testing
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing