Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Silbe <silbe@activitycentral.com>2011-05-10 15:24:07 (GMT)
committer Anish Mangal <anish@sugarlabs.org>2011-09-19 13:35:58 (GMT)
commitec7d521ad933ebe900ae268fa12f1d837489ee42 (patch)
tree366648627ffb14720d5a0710b341a228237b6008
parenta0d62ab86fa7e192e6cd4fe2eeb6cf0cfe98a09a (diff)
Fix XO-1 build
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
-rw-r--r--config/dextrose3-common.ini3
-rw-r--r--config/dextrose3-xo1-common.ini6
-rw-r--r--config/dextrose3-xo1.5-common.ini6
3 files changed, 12 insertions, 3 deletions
diff --git a/config/dextrose3-common.ini b/config/dextrose3-common.ini
index 0091a62..b2fd460 100644
--- a/config/dextrose3-common.ini
+++ b/config/dextrose3-common.ini
@@ -44,7 +44,6 @@ fedora_release=14
olpc_version_major=11
olpc_version_minor=2
olpc_version_release=0
-target_platform=XO-1.5
image_name=dx3ng%%03d
[sd_card_image]
@@ -58,7 +57,6 @@ compress_disk_image=1
[repos]
fedora=fedora,fedora-updates,fedora-updates-testing
olpc_publicrpms_1=1,f14
-olpc_publicrpms_2=1,f14-xo1.5
custom_repo_1=1,dextrose3,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
custom_repo_2=1,dextrose3-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
add_excludes_to=fedora,fedora-updates,fedora-updates-testing
@@ -100,7 +98,6 @@ del_packages=
addrepo_1=1,dextrose3,http://download.sugarlabs.org/dextrose/testing/dx3/rpms/i386/os
addrepo_2=1,dextrose3-freeworld,http://download.sugarlabs.org/dextrose/testing/dx3/rpms-freeworld/i386/os
addrepo_3=1,olpc-f14,http://xs-dev.laptop.org/~dsd/repos/f14/
-addrepo_4=1,olpc-f14-xo1.5,http://xs-dev.laptop.org/~dsd/repos/f14-xo1.5/
force_enable=fedora-updates-testing
add_excludes_to=fedora,fedora-updates,fedora-updates-testing
diff --git a/config/dextrose3-xo1-common.ini b/config/dextrose3-xo1-common.ini
index 0013062..f1b02d6 100644
--- a/config/dextrose3-xo1-common.ini
+++ b/config/dextrose3-xo1-common.ini
@@ -12,3 +12,9 @@ enable_idle_suspend=0
[sd_card_image]
make_zd=0
+
+[repos]
+olpc_publicrpms_2=1,f14-xo1
+
+[yumcfg]
+addrepo_4=1,olpc-f14-xo1,http://xs-dev.laptop.org/~dsd/repos/f14-xo1/
diff --git a/config/dextrose3-xo1.5-common.ini b/config/dextrose3-xo1.5-common.ini
index 9f6f7dd..30c7e9b 100644
--- a/config/dextrose3-xo1.5-common.ini
+++ b/config/dextrose3-xo1.5-common.ini
@@ -11,3 +11,9 @@ enable_idle_suspend=1
[sd_card_image]
make_zd=1
+
+[repos]
+olpc_publicrpms_2=1,f14-xo1.5
+
+[yumcfg]
+addrepo_4=1,olpc-f14-xo1.5,http://xs-dev.laptop.org/~dsd/repos/f14-xo1.5/