Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2011-06-22 13:59:12 (GMT)
committer Daniel Drake <dsd@laptop.org>2011-06-22 13:59:12 (GMT)
commit47fa3720cb199fbc15b63802c89ba01bc9dd6b69 (patch)
treebfd43dd9397d344519c65a8e654f75ff83f15c7a
parent76efb360f44222641359bf108b6d49ea4718501d (diff)
Update 11.2.0 configs for release candidate
-rw-r--r--examples/olpc-os-11.2.0-xo1.5.ini12
-rw-r--r--examples/olpc-os-11.2.0-xo1.ini10
2 files changed, 12 insertions, 10 deletions
diff --git a/examples/olpc-os-11.2.0-xo1.5.ini b/examples/olpc-os-11.2.0-xo1.5.ini
index 05313dd..41233aa 100644
--- a/examples/olpc-os-11.2.0-xo1.5.ini
+++ b/examples/olpc-os-11.2.0-xo1.5.ini
@@ -19,21 +19,23 @@ modules=
usb_update
[sd_card_image]
+; 8GB image
+size_3=7730941132,zd8
; 4GB image
size_1=3865470566,zd4
; 2GB image
size_2=1932735283,zd2
[repos]
-fedora=fedora,fedora-updates,fedora-updates-testing
-olpc_publicrpms_1=1,f14
-olpc_publicrpms_2=1,f14-xo1.5
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+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
+olpc_frozen_4=1,local.11.2.0-xo1.5
+add_excludes_to=koji.dist-f14-i686,koji.dist-f14-i686-updates-11.2.0
[yumcfg]
addrepo_1=1,olpc-f14,http://xs-dev.laptop.org/~dsd/repos/f14/
addrepo_2=1,olpc-f14-xo1.5,http://xs-dev.laptop.org/~dsd/repos/f14-xo1.5/
-force_enable=fedora-updates-testing
add_excludes_to=fedora,fedora-updates,fedora-updates-testing
[sugar]
diff --git a/examples/olpc-os-11.2.0-xo1.ini b/examples/olpc-os-11.2.0-xo1.ini
index a54f611..58ff93c 100644
--- a/examples/olpc-os-11.2.0-xo1.ini
+++ b/examples/olpc-os-11.2.0-xo1.ini
@@ -20,15 +20,15 @@ modules=
usb_update
[repos]
-fedora=fedora,fedora-updates,fedora-updates-testing
-olpc_publicrpms_1=1,f14
-olpc_publicrpms_2=1,f14-xo1
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+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
+olpc_frozen_4=1,local.11.2.0-xo1
+add_excludes_to=koji.dist-f14-i686,koji.dist-f14-i686-updates-11.2.0
[yumcfg]
addrepo_1=1,olpc-f14,http://xs-dev.laptop.org/~dsd/repos/f14/
addrepo_2=1,olpc-f14-xo1,http://xs-dev.laptop.org/~dsd/repos/f14-xo1/
-force_enable=fedora-updates-testing
add_excludes_to=fedora,fedora-updates,fedora-updates-testing
[sugar]