diff options
| author | Bernie Innocenti <bernie@codewiz.org> | 2010-06-20 14:51:38 (GMT) |
|---|---|---|
| committer | Bernie Innocenti <bernie@codewiz.org> | 2010-06-20 14:51:38 (GMT) |
| commit | 0f864fa000fae259b6606a92d108b6ba9972e65a (patch) | |
| tree | a4b3bcd1b0dde845d804c7cbe69503a68f053c66 /examples | |
| parent | 888566a4e19136309350241ba4f5e383beadd648 (diff) | |
| parent | 92ae3624d3c501cd8cd46df3545ab98cbdb5f883 (diff) | |
Merge remote branch 'origin/master'
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/f11-xo1.5.ini | 7 | ||||
| -rw-r--r-- | examples/olpc-os-10.1.0-xo1.5.ini | 2 | ||||
| -rw-r--r-- | examples/olpc-os-10.1.1-xo1.5.ini | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/f11-xo1.5.ini b/examples/f11-xo1.5.ini index d925e54..9726c0d 100644 --- a/examples/f11-xo1.5.ini +++ b/examples/f11-xo1.5.ini @@ -23,7 +23,7 @@ modules= ; 4GB image size_1=3865470566 ; 2GB image -size_2=1932735283,2gb +size_2=1932735283,2g [repos] fedora=fedora,fedora-updates,fedora-updates-testing @@ -46,12 +46,12 @@ favorites_view_add= 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.RecordActivity, org.laptop.community.Finance favorites_view_del= org.laptop.Terminal, @@ -63,7 +63,6 @@ activities=org.laptop.WebActivity, org.laptop.sugar.ReadActivity, org.laptop.AbiWordActivity, org.laptop.Oficina, - org.laptop.RecordActivity, org.laptop.TamTamSynthLab, org.laptop.TamTamJam, org.laptop.TamTamEdit, @@ -89,7 +88,6 @@ activities=org.laptop.WebActivity, org.laptop.ImageViewerActivity, org.sugarlabs.InfoSlicer, org.laptop.community.Colors, - com.socialtext.SocialCalcActivity, org.laptop.community.Finance, org.laptop.AcousticMeasure, org.laptop.StopWatchActivity @@ -109,6 +107,7 @@ url_11=http://wiki.laptop.org/images/3/34/ICDL-8.xol url_12=http://wiki.laptop.org/images/a/af/WorldFactbookMaps-6.xol url_13=http://wiki.laptop.org/images/f/fe/WikisliceChemistry-en-8.xol url_14=http://dev.laptop.org/~sj/WorldDigitalLibrary-5.xol +url_15=dev.laptop.org/~cjb/record-76.xo [sugar_activity_group] url=http://wiki.laptop.org/go/Activities/G1G1 diff --git a/examples/olpc-os-10.1.0-xo1.5.ini b/examples/olpc-os-10.1.0-xo1.5.ini index 80cde4d..c3b6637 100644 --- a/examples/olpc-os-10.1.0-xo1.5.ini +++ b/examples/olpc-os-10.1.0-xo1.5.ini @@ -36,7 +36,7 @@ add_excludes_to=koji.dist-f11,koji.dist-f11-updates ; 3780mb size_1=3964665000 ; 1985mb -size_2=1977614336,2gb +size_2=1977614336,2g [yumcfg] addrepo_1=0,olpc-fedora-updates,http://mock.laptop.org/repos/koji.dist-f11-updates diff --git a/examples/olpc-os-10.1.1-xo1.5.ini b/examples/olpc-os-10.1.1-xo1.5.ini index 90dec92..6d507c8 100644 --- a/examples/olpc-os-10.1.1-xo1.5.ini +++ b/examples/olpc-os-10.1.1-xo1.5.ini @@ -8,6 +8,7 @@ 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, + signing, xo1_5, buildnr_from_file, repos, @@ -29,7 +30,7 @@ add_excludes_to=koji.dist-f11,koji.dist-f11-updates-10.1.1 ; 4GB image size_1=3865470566 ; 2GB image -size_2=1932735283,2gb +size_2=1932735283,2g [yumcfg] addrepo_1=0,olpc-fedora-updates,http://mock.laptop.org/repos/koji.dist-f11-updates-10.1.1 |