diff options
author | Santiago Collazo <scollazo@activitycentral.com> | 2012-12-06 16:36:21 (GMT) |
---|---|---|
committer | Santiago Collazo <scollazo@activitycentral.com> | 2012-12-06 16:36:21 (GMT) |
commit | 95851f720c7a9f8c3a44b4dd5ff7be4d6982c901 (patch) | |
tree | b2a89f5615c3045b3c743e20447321aa02d48102 | |
parent | b68c9300f1127f68b581b8d94d00b92a29530e28 (diff) |
Merge upstream changes and add custom dx4 activities
- Updated repos
- Generate usb image
- Add DX4 url for activity group
-rw-r--r-- | examples/dextrose4-xo1.5.ini | 13 | ||||
-rw-r--r-- | examples/dextrose4-xo1.75.ini | 12 | ||||
-rw-r--r-- | examples/dextrose4-xo1.ini | 13 | ||||
-rw-r--r-- | examples/dextrose4-xo4.ini | 13 |
4 files changed, 31 insertions, 20 deletions
diff --git a/examples/dextrose4-xo1.5.ini b/examples/dextrose4-xo1.5.ini index 3671410..3ccfef5 100644 --- a/examples/dextrose4-xo1.5.ini +++ b/examples/dextrose4-xo1.5.ini @@ -26,11 +26,14 @@ keep_disk_image=1 compress_disk_image=1 make_zd=1 +[usb_update] + [repos] -fedora=fedora,fedora-updates,fedora-updates-testing -olpc_publicrpms_1=1,f18 -olpc_publicrpms_2=1,f18-xo1.5 -add_excludes_to=fedora,fedora-updates,fedora-updates-testing +olpc_frozen_1=0,koji.dist-f18-i686-13.1.0 +olpc_frozen_2=0,koji.dist-f18-i686-updates-13.1.0 +olpc_frozen_3=1,local.13.1.0 +olpc_frozen_4=1,local.13.1.0-xo1.5 +add_excludes_to=koji.dist-f18-i686-13.1.0,koji.dist-f18-i686-updates-13.1.0 custom_repo_1=1,dextrose,http://build.activitycentral.com/devel-rpms [yumcfg] @@ -75,7 +78,7 @@ protected_activities= org.laptop.RecordActivity [sugar_activity_group] -url=http://wiki.laptop.org/go/Activities/G1G1/13.1 +url=http://wiki.laptop.org/go/Activities/DX/4 [sugar_activities_extra] local_dir = activities diff --git a/examples/dextrose4-xo1.75.ini b/examples/dextrose4-xo1.75.ini index 5976101..fdf67fa 100644 --- a/examples/dextrose4-xo1.75.ini +++ b/examples/dextrose4-xo1.75.ini @@ -23,11 +23,13 @@ customization_tag=DX [sd_card_image] +[usb_update] + [repos] -fedora=fedora,fedora-updates-testing -olpc_publicrpms_1=1,f18 -olpc_publicrpms_2=1,f18-xo1.75 -add_excludes_to=fedora,fedora-updates-testing +olpc_frozen_1=0,koji.dist-f18-armv7hl-13.1.0 +olpc_frozen_2=0,koji.dist-f18-armv7hl-updates-13.1.0 +olpc_frozen_3=1,local.13.1.0 +olpc_frozen_4=1,local.13.1.0-xo1.75 custom_repo_1=1,dextrose,http://build.activitycentral.com/devel-rpms @@ -75,7 +77,7 @@ protected_activities= org.laptop.RecordActivity [sugar_activity_group] -url=http://wiki.laptop.org/go/Activities/G1G1/13.1 +url=http://wiki.laptop.org/go/Activities/DX/4 [sugar_activities_extra] local_dir = activities diff --git a/examples/dextrose4-xo1.ini b/examples/dextrose4-xo1.ini index f776c0a..3a0fca6 100644 --- a/examples/dextrose4-xo1.ini +++ b/examples/dextrose4-xo1.ini @@ -24,11 +24,14 @@ customization_tag=DX [jffs2_image] +[usb_update] + [repos] -fedora=fedora,fedora-updates,fedora-updates-testing -olpc_publicrpms_1=1,f18 -olpc_publicrpms_2=1,f18-xo1 -add_excludes_to=fedora,fedora-updates,fedora-updates-testing +olpc_frozen_1=0,koji.dist-f18-i686-13.1.0 +olpc_frozen_2=0,koji.dist-f18-i686-updates-13.1.0 +olpc_frozen_3=1,local.13.1.0 +olpc_frozen_4=1,local.13.1.0-xo1 +add_excludes_to=koji.dist-f18-i686-13.1.0,koji.dist-f18-i686-updates-13.1.0 custom_repo_1=1,dextrose,http://build.activitycentral.com/devel-rpms [yumcfg] @@ -62,7 +65,7 @@ protected_activities= org.laptop.RecordActivity [sugar_activity_group] -url=http://wiki.laptop.org/go/Activities/G1G1Lite/13.1 +url=http://wiki.laptop.org/go/Activities/DX/4Lite [sugar_activities_extra] local_dir = activities diff --git a/examples/dextrose4-xo4.ini b/examples/dextrose4-xo4.ini index 17531ec..e66d3b2 100644 --- a/examples/dextrose4-xo4.ini +++ b/examples/dextrose4-xo4.ini @@ -23,11 +23,14 @@ customization_tag=DX [sd_card_image] +[usb_update] + [repos] -fedora=fedora,fedora-updates-testing -olpc_publicrpms_1=1,f18 -olpc_publicrpms_2=1,f18-xo4 -add_excludes_to=fedora,fedora-updates-testing +olpc_frozen_1=0,koji.dist-f18-i686-13.1.0 +olpc_frozen_2=0,koji.dist-f18-i686-updates-13.1.0 +olpc_frozen_3=1,local.13.1.0 +olpc_frozen_4=1,local.13.1.0-xo1 +add_excludes_to=koji.dist-f18-i686-13.1.0,koji.dist-f18-i686-updates-13.1.0 custom_repo_1=1,dextrose,http://build.activitycentral.com/devel-rpms @@ -75,7 +78,7 @@ protected_activities= org.laptop.RecordActivity [sugar_activity_group] -url=http://wiki.laptop.org/go/Activities/G1G1/13.1 +url=http://wiki.laptop.org/go/Activities/DX/4Lite [sugar_activities_extra] local_dir = activities |