From 7688ecd372ac42a2f4b968c2022308935f88e233 Mon Sep 17 00:00:00 2001 From: anish Date: Mon, 15 Aug 2011 15:12:55 +0000 Subject: [PATCH] Add olpc frozen rpms and new (dx3) upstream-cherries repo Signed-off-by: Anish Mangal --- config/dextrose3-common.ini | 9 ++++++--- config/dextrose3-xo1-common.ini | 2 +- config/dextrose3-xo1.5-common.ini | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/dextrose3-common.ini b/config/dextrose3-common.ini index d3044ee..5614ec2 100644 --- a/config/dextrose3-common.ini +++ b/config/dextrose3-common.ini @@ -55,11 +55,13 @@ keep_disk_image=1 compress_disk_image=1 [repos] -fedora=fedora,fedora-updates,fedora-updates-testing -olpc_publicrpms_1=1,f14 +olpc_frozen_1=0,koji.dist-f14-i686 +olpc_frozen_2=0,koji.dist-f14-i686-updates-11.2.0 +olpc_frozen_3=1,local.11.2.0 custom_repo_1=1,dextrose3,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os custom_repo_2=1,dextrose3-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os -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 +add_excludes_to=koji.dist-f14-i686,koji.dist-f14-i686-updates-11.2.0 [custom_packages] del_packages= @@ -98,6 +100,7 @@ del_packages= addrepo_1=1,dextrose3,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os addrepo_2=1,dextrose3-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os addrepo_3=1,olpc-f14,http://xs-dev.laptop.org/~dsd/repos/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 diff --git a/config/dextrose3-xo1-common.ini b/config/dextrose3-xo1-common.ini index f1b02d6..4efca42 100644 --- a/config/dextrose3-xo1-common.ini +++ b/config/dextrose3-xo1-common.ini @@ -14,7 +14,7 @@ enable_idle_suspend=0 make_zd=0 [repos] -olpc_publicrpms_2=1,f14-xo1 +olpc_frozen_4=1,local.11.2.0-xo1 [yumcfg] addrepo_4=1,olpc-f14-xo1,http://xs-dev.laptop.org/~dsd/repos/f14-xo1/ diff --git a/config/dextrose3-xo1.5-common.ini b/config/dextrose3-xo1.5-common.ini index 30c7e9b..cf1a94f 100644 --- a/config/dextrose3-xo1.5-common.ini +++ b/config/dextrose3-xo1.5-common.ini @@ -13,6 +13,7 @@ enable_idle_suspend=1 make_zd=1 [repos] +olpc_frozen_4=1,local.11.2.0-xo1.5 olpc_publicrpms_2=1,f14-xo1.5 [yumcfg] -- 1.7.3.1