diff options
| author | Chris Ball <cjb@laptop.org> | 2010-07-27 15:08:26 (GMT) |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2010-07-27 15:08:26 (GMT) |
| commit | 5dd629691487b67ad46afa189cc2145f5257a825 (patch) | |
| tree | a4ecb277a9c6b7d702126e812df1b5bd93a428d7 /examples | |
| parent | 94507550d5be0e651f4d2e14092d0b5f5243d982 (diff) | |
| parent | 95c004190140ea61f9047dff6254536a4224af5a (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/olpc-os-builder
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/f11-xo1.ini | 3 | ||||
| -rw-r--r-- | examples/olpc-os-10.1.2-xo1.5.ini | 38 | ||||
| -rw-r--r-- | examples/olpc-os-10.1.2-xo1.ini | 3 |
3 files changed, 39 insertions, 5 deletions
diff --git a/examples/f11-xo1.ini b/examples/f11-xo1.ini index 8f5a61c..dc57b07 100644 --- a/examples/f11-xo1.ini +++ b/examples/f11-xo1.ini @@ -4,11 +4,10 @@ olpc_version_major=0 olpc_version_minor=0 olpc_version_release=0 target_platform=XO-1 -langs=en,es,ar,pl,pt_BR,pt,it,fr,ht,el,mn,mr_IN,th,am_ET,km_KH,ne_NP,ur_PK,rw,ja,de,tr,te,ps,fa_AF,si,zh_CN +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, - powerd, buildnr_from_file, jffs2_image, repos, diff --git a/examples/olpc-os-10.1.2-xo1.5.ini b/examples/olpc-os-10.1.2-xo1.5.ini new file mode 100644 index 0000000..50987f9 --- /dev/null +++ b/examples/olpc-os-10.1.2-xo1.5.ini @@ -0,0 +1,38 @@ +[global] +fedora_release=11 +olpc_version_major=10 +olpc_version_minor=1 +olpc_version_release=2 +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, + buildnr_from_file, + jffs2_image, + repos, + yumcfg, + x11, + sugar, + sugar_activity_group, + gnome + +[repos] +olpc_frozen_1=0,koji.dist-f11 +olpc_frozen_2=0,koji.dist-f11-updates-10.1.2 +olpc_frozen_3=1,local.10.1.2 +olpc_frozen_4=1,local.10.1.2-xo1.5 +add_excludes_to=koji.dist-f11,koji.dist-f11-updates-10.1.2 + +[yumcfg] +addrepo_1=0,olpc-fedora-updates,http://mock.laptop.org/repos/koji.dist-f11-updates-10.1.2 +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_activity_group] +url=http://wiki.laptop.org/go/Activities/G1G1Lite + diff --git a/examples/olpc-os-10.1.2-xo1.ini b/examples/olpc-os-10.1.2-xo1.ini index 0a977fd..44e2dd0 100644 --- a/examples/olpc-os-10.1.2-xo1.ini +++ b/examples/olpc-os-10.1.2-xo1.ini @@ -8,7 +8,6 @@ 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 modules= base, xo1, - powerd, buildnr_from_file, jffs2_image, repos, @@ -37,5 +36,3 @@ path=latestbuild [sugar_activity_group] url=http://wiki.laptop.org/go/Activities/G1G1Lite -[powerd] -enable_idle_suspend=1 |