Latest patches from alsroot's reference-xo

4 files changed, 33 insertions, 21 deletions

diff --git a/etc/sweets.conf b/etc/sweets.conf
index d13dca1..b8bb2aa 100644
--- a/etc/sweets.conf
+++ b/etc/sweets.conf
@@ -1,11 +1,19 @@
+[main]
+# Helps while debugging
+debug = 3
+
 [shell]
-# space separated list of plugins to enable
+# Space separated list of plugins to enable.
+# To upload users' stats to a Sugar Network node, add "stats" plugin.
 plugins = telepathy proxy sn stats
 
 [blacklist]
-# Uncomment it to hide "Plugins" Control Panel section to
+cpsection =
+# Standard Shell updater doesn't make sense if Sugar Network is enabled
+    updater
+# Uncomment to hide "Plugins" Control Panel section to
 # hanlde plugins configuration only via configuration files
-cpsection = plugins
+    plugins
 
 # Sugar Network client configuration
 # http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Implementation#sugar-network-client
@@ -16,11 +24,12 @@ api-url = http://node-testing.sugarlabs.org
 # for now, "pilot" layer is being used to QA most useful/stable activities
 layers = pilot
 
-# the minimal disk free space, in percents, to preserve while recycling disk
-# cache                         
-cache-limit = 10                
-# check disk cache for recycling in specified delay in seconds
-cache-timeout = 3600 
+# By default, only stable Sugar Activity implementation will be fetched
+# from the Sugar Network. To stability selection customizable, add exceptions
+# to the following section. Each option shold conform the format:
+# <CONTEXT_GUID> = <LIST_OF_STABILITIES>
+[stabilities]
+org.somosazucar.ServidorVNC = developer stable
 
 # Default parameters for sugar-plugin-stats package
 [sugar-plugin-stats]
@@ -35,4 +44,4 @@ stats-timeout = 3600
 # Default parameters for sugar-plugin-upgrade package
 [sugar-plugin-upgrade]
 # if more than 0, do regular unattended system update with specified delay in seconds
-upgrade-timeout = 0
+upgrade-timeout = 86400
diff --git a/image/common.ini b/image/common.ini
index cf697ad..c0f5fbe 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -47,11 +47,14 @@ modules_extra =
 path = latestbuild
 
 [sweets]
-# OBS repository on packages.sugarlabs.org with downstream extra packages.
-# This repository will be used to install packages during image building,
-# and, for post-image system upgrades. Repository should be in form of:
-# <OBS_PROJECT>::<OBS_REPOSITORY>
-deployment_repository = Hexoquinasa:1/Fedora-14
+# OBS repositories from packages.sugarlabs.org to install packages
+# during image building phase and for post-image system upgrades.
+# Each item should be in form of <OBS_PROJECT>/<OBS_REPOSITORY>
+repositories = 
+# Sugar Network is being packaged in one of SweetsDistribution:* projects
+    SweetsDistribution:Factory/Fedora-%(fedora_release)s,
+# It is a good practice to have a deployment.rpm, see [custom_packages] below
+	Hexoquinasa:1/Fedora-14,
 
 # List of bundle_ids (or Context GUIDs in Sugar Network terms) of activities
 # to prefetch to the final image to make them accessible in offline right after
@@ -61,7 +64,7 @@ offline_activities =
     org.laptop.WebActivity,
     org.laptop.Calculate,
     org.laptop.Chat,
-#    org.vpri.EtoysActivity,
+    org.vpri.EtoysActivity,
     org.laptop.ImageViewerActivity,
     org.laptop.sugar.Jukebox,
     org.laptop.sugar.ReadActivity,
@@ -79,7 +82,7 @@ offline_activities =
     org.laptop.MeasureActivity,
     org.somosazucar.ServidorVNC,
 #net.gcompris,
-#    edu.mit.media.ScratchActivity,
+    edu.mit.media.ScratchActivity,
     org.ceibaljam.conozcoamerica,
     org.sugarlabs.ICanReadActivity,
     org.sugarlabs.SimpleGraph,
@@ -100,7 +103,7 @@ favorite_activities =
     org.laptop.Chat,
     org.laptop.TurtleArtActivity,
     org.laptop.AbiWordActivity,
-#    org.laptop.physics,
+    org.laptop.physics,
     org.laptop.TamTamMini,
     org.ceibaljam.conozcoamerica,
     vu.lux.olpc.Speak,
@@ -111,9 +114,9 @@ add_packages =
 #   Deployment package which fetches all required dependencies and contains
 #   proper configuration. Post-image support will happen by updating
 #   `deployment.rpm` and spreading it via Sugar Network nodes.
-    deployment-testing,
-    sugar-plugin-stats,
-    sugar-stats,
+    deployment,
+#    sugar-plugin-stats,
+#    sugar-stats,
 #   Useful packages from rpmfusion repository.
     gstreamer-plugins-ugly,
     gstreamer-ffmpeg,
diff --git a/image/latestbuild b/image/latestbuild
deleted file mode 100644
index 9d07aa0..0000000
--- a/image/latestbuild
+++ /dev/null
@@ -1 +0,0 @@
-111
\ No newline at end of file
diff --git a/image/post.sh b/image/post.sh
index 9c86aec..3c4f687 100755
--- a/image/post.sh
+++ b/image/post.sh
@@ -14,4 +14,5 @@ cp $src_root/../boot_logo/frame00.565  usr/share/boot-anim/
 
 mkdir -p home/olpc/Activities
 unzip -d home/olpc/Activities $src_root/../activities/Physics-11.7.xo
+#unzip -d home/olpc/Activities $src_root/../activities/Speak-47.1.xo
 chmod 777 home/olpc/* -R