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-10-06 12:14:35 (GMT)
committer Anish Mangal <anish@activitycentral.com>2012-01-27 12:19:25 (GMT)
commit9a3a37e5c8eef0fc844719321e75b681c8af3484 (patch)
tree829baecdb6e0f95a3495b132160db50406d9f03f
parent39144184b5fde88d89893a34e73e209910ecc2c7 (diff)
11.3.0 configs: modify for release candidates
Switch to frozen repositories. Switch to JFFS2 again for XO-1 (still some big outstanding ubifs issues). Enable olpc-update .usb file output. Enable 8GB XO-1.5 image creation.
-rw-r--r--examples/olpc-os-11.3.0-xo1.5.ini12
-rw-r--r--examples/olpc-os-11.3.0-xo1.75.ini10
-rw-r--r--examples/olpc-os-11.3.0-xo1.ini12
3 files changed, 21 insertions, 13 deletions
diff --git a/examples/olpc-os-11.3.0-xo1.5.ini b/examples/olpc-os-11.3.0-xo1.5.ini
index 0c801bc..067dc23 100644
--- a/examples/olpc-os-11.3.0-xo1.5.ini
+++ b/examples/olpc-os-11.3.0-xo1.5.ini
@@ -11,6 +11,7 @@ modules=
buildnr_from_file,
yumcfg,
sd_card_image,
+ usb_update,
repos,
x11,
sugar,
@@ -18,6 +19,8 @@ modules=
gnome
[sd_card_image]
+; 8GB image
+size_3=7730941132,zd8
; 4GB image
size_1=3865470566,zd4
; 2GB image
@@ -25,10 +28,11 @@ 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
-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.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/
diff --git a/examples/olpc-os-11.3.0-xo1.75.ini b/examples/olpc-os-11.3.0-xo1.75.ini
index 6984cea..8c28b24 100644
--- a/examples/olpc-os-11.3.0-xo1.75.ini
+++ b/examples/olpc-os-11.3.0-xo1.75.ini
@@ -11,6 +11,7 @@ modules=
buildnr_from_file,
yumcfg,
sd_card_image,
+ usb_update,
repos,
x11,
sugar,
@@ -23,10 +24,11 @@ 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
+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/
diff --git a/examples/olpc-os-11.3.0-xo1.ini b/examples/olpc-os-11.3.0-xo1.ini
index 7d06541..d80c3ce 100644
--- a/examples/olpc-os-11.3.0-xo1.ini
+++ b/examples/olpc-os-11.3.0-xo1.ini
@@ -10,7 +10,8 @@ modules=
xo1,
buildnr_from_file,
yumcfg,
- ubifs_image,
+ jffs2_image,
+ usb_update,
repos,
x11,
powerd,
@@ -20,10 +21,11 @@ modules=
[repos]
fedora_arch=i386
-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.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/