Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2010-07-27 20:44:37 (GMT)
committer Chris Ball <cjb@laptop.org>2010-07-27 20:44:37 (GMT)
commitf87d4a4552cc7c5d38bdf58039a6a54ca2e0f894 (patch)
treed2d3da3bf4456c231af2352f27512f72ad7d5a0e
parent2faaea52ed2e5c3ec49838388e296ca00e84228e (diff)
parent9473c46d3ccfeb57f7266748891eb751db5512b0 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/olpc-os-builder
-rw-r--r--examples/olpc-os-10.1.2-xo1.5.ini27
1 files changed, 22 insertions, 5 deletions
diff --git a/examples/olpc-os-10.1.2-xo1.5.ini b/examples/olpc-os-10.1.2-xo1.5.ini
index 50463e6..06c249f 100644
--- a/examples/olpc-os-10.1.2-xo1.5.ini
+++ b/examples/olpc-os-10.1.2-xo1.5.ini
@@ -7,10 +7,10 @@ target_platform=XO-1.5
langs=en_US,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
modules=
base,
- xo1.5,
+ xo1_5,
buildnr_from_file,
- sd_card_image,
repos,
+ sd_card_image,
yumcfg,
x11,
sugar,
@@ -36,9 +36,26 @@ addrepo_2=1,olpc,http://mock.laptop.org/repos/local.10.1.2
addrepo_3=1,olpc-xo1,http://mock.laptop.org/repos/local.10.1.2-xo1.5
add_excludes_to=fedora,fedora-updates,fedora-updates-testing
-[buildnr_from_file]
-path=latestbuild
+[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.Jukebox,
+ com.socialtext.SocialCalcActivity,
+ org.laptop.sugar.GetBooksActivity,
+ org.laptop.WikipediaActivity,
+ org.laptop.WikipediaActivityEN,
+ org.laptop.community.Colors,
+ org.laptop.StopWatchActivity,
+ org.laptop.community.Finance
[sugar_activity_group]
-url=http://wiki.laptop.org/go/Activities/G1G1Lite
+url=http://wiki.laptop.org/go/Activities/G1G1
+
+[buildnr_from_file]
+path=latestbuild