From ded0c4a8d253f9b0a2098a4061e35fcf58b60c06 Mon Sep 17 00:00:00 2001 From: Aleksey Lim Date: Fri, 17 Aug 2012 10:09:14 +0000 Subject: More deployment related configs --- diff --git a/etc/sweets.conf b/etc/sweets.conf index eaf00fc..9cb3e12 100644 --- a/etc/sweets.conf +++ b/etc/sweets.conf @@ -1,7 +1,26 @@ -[sweets] +[shell] # space separated list of plugins to enable -plugins = sn +plugins = sn client [local] # url to connect to Sugar Network server API api-url = http://api-testing.network.sugarlabs.org + +[client] +# start cron tasks with specified timeout in seconds; it makes sense to avoid +# overloading the system on startup +cron-delay = 300 +# enable collecting of usage statistics +stats = True +# space separated list of RRAs for RRD databases to keep usage statistics +stats-rras = RRA:AVERAGE:0.5:1:4320 RRA:AVERAGE:0.5:5:2016 +# step interval in seconds for RRD databases to keep usage statistics +stats-step = 60 +# if more than 0 and --stats specified, upload collected usage statistics to +# Sugar Network server with specified delay in seconds +stats-timeout = 3600 +# optional command-line arguments to pass to packager while unattended updating +# the system +update-args = --disablerepo=* --enablerepo=sweets_base --enablerepo=sweets --enablerepo=deployment +# if more than 0, do regular unattended updates with specified delay in seconds +update-timeout = 3600 diff --git a/image/common.ini b/image/common.ini new file mode 100644 index 0000000..09d49c7 --- /dev/null +++ b/image/common.ini @@ -0,0 +1,76 @@ +# +# Common configuration for all XO models. +# + +[global] +# Image title. +# Put your title here. +customization_info = Reference XO distribution + +# Image filename. +# String should contain one formatting argument to make Python expression, +# `image_name % latestbuild`, valid. Make sure that you escaped `%` symbol +# by `%%`. Put your filename here. +image_name = xo%%d + +# Minimal list of required modules. +# All of the following modules need to be added to keep final image consistent. +# `*sugar*` modules are not included on purpose, Sugar related configuration +# will happen in `sweets-deployment` package added by `sweets` module. +modules_common = + base, + repos, + yumcfg, + powerd, + x11, +# Keep current build number in path set by [buildnr_from_file]. + buildnr_from_file, +# Include Sweets Distribution specific settings. + sweets + +[buildnr_from_file] +# Path to file to keep current image release number. +# If you change this file manually, make sure that file content doesn't end +# with new line symbol to avoid fails from `olpc-os-builder` internals. +path = latestbuild + +[sweets] +# Name of Sweets Distribution repository current one is based on. +# http://wiki.sugarlabs.org/go/Template:Sweets_Distribution_Linkbar +# Right now, only "Factory" is accessible. +sweets_repository = Factory + +# Url to downstream repository. Put your url here. +deployment_repository_url = http://download.sugarlabs.org/packages/SweetsDistribution:/Factory:/ReferenceXO/Fedora-%(fedora_release)s/ + +# List of bundle_ids (or context GUIDs in Sugar Network terms) of activities +# to prefetch to final image to make them accessible in offline right after +# flasing. These activities should exist in Sugar Network. +# Put your activities list here. +offline_activities = + org.laptop.WebActivity, + org.laptop.Calculate, + org.laptop.Chat, + org.vpri.EtoysActivity, + org.laptop.ImageViewerActivity, + org.laptop.sugar.Jukebox, + org.laptop.Log, + org.laptop.Pippy, + org.laptop.sugar.ReadActivity, + org.laptop.Terminal, + org.laptop.TurtleArtActivity, + org.laptop.AbiWordActivity, + +# List of bundle_ids (or context GUIDs in Sugar Network terms) of activities +# make them favorited in Sugar Shell Home view. These activities need +# to be mentioned in `offline_activities` option as well. +# Put your activities list here. +favorite_activities = + org.laptop.WebActivity, + org.laptop.Calculate, + org.laptop.Chat, + org.vpri.EtoysActivity, + org.laptop.Pippy, + org.laptop.Terminal, + org.laptop.TurtleArtActivity, + org.laptop.AbiWordActivity, diff --git a/image/latestbuild b/image/latestbuild new file mode 100644 index 0000000..c227083 --- /dev/null +++ b/image/latestbuild @@ -0,0 +1 @@ +0 \ No newline at end of file diff --git a/image/xo-1.5.ini b/image/xo-1.5.ini new file mode 100644 index 0000000..c1e39e1 --- /dev/null +++ b/image/xo-1.5.ini @@ -0,0 +1,21 @@ +# +# XO-1.5 final configuration. +# + +[global] +modules = +# Create ext4 SD card image files to flash on XO-1.5 laptops. + sd_card_image, +# This handy module includes all needed options and modules to make +# downstream distribution based on stable OLPC 11.3.1 release on XO-1.5 laptops. +# It might override other modules' default settings, so, keep it last. +# For other OLPC release modules, see sources on +# http://git.sugarlabs.org/platform/olpc-os-builder/trees/master/modules + olpc_11_3_1_xo1_5 + +[sd_card_image] +# 2GB image +size_1 = 1932735283,zd +keep_disk_image = 0 +compress_disk_image = 0 +make_zd = 1 diff --git a/image/xo-1.ini b/image/xo-1.ini new file mode 100644 index 0000000..9fb66b3 --- /dev/null +++ b/image/xo-1.ini @@ -0,0 +1,14 @@ +# +# XO-1 final configuration. +# + +[global] +modules = +# Create .img and .crc jffs2 image files to flash on XO-1 laptops. + jffs2_image, +# This handy module includes all needed options and modules to make +# downstream distribution based on stable OLPC 11.3.1 release on XO-1 laptops. +# It might override other modules' default settings, so, keep it last. +# For other OLPC release modules, see sources on +# http://git.sugarlabs.org/platform/olpc-os-builder/trees/master/modules + olpc_11_3_1_xo1 diff --git a/oob/include.ini b/oob/include.ini deleted file mode 100644 index f9317d4..0000000 --- a/oob/include.ini +++ /dev/null @@ -1,48 +0,0 @@ -[DEFAULT] -olpc_version_major = 11 -olpc_version_minor = 3 -olpc_version_release = 1 - -[global] -customization_info = Reference XO distribution -fedora_release = 14 -image_name = xo%%d - -[base] -versioned_fs = 0 -make_tree_tarball = 0 - -[repos] -fedora_arch = i386 -fedora = fedora,fedora_updates -olpc_frozen_01 = 1,local.%(olpc_version_major)s.%(olpc_version_minor)s.%(olpc_version_release)s -add_excludes_to = fedora,fedora-updates,fedora-updates-testing - -[yumcfg] -addrepo_01 = 1,local,http://mock.laptop.org/repos/local.%(olpc_version_major)s.%(olpc_version_minor)s.%(olpc_version_release)s -add_excludes_to = fedora,fedora-updates,fedora-updates-testing - -[sweets] -repository = Factory:ReferenceXO -offline_activities = - org.laptop.WebActivity, - org.laptop.Calculate, - org.laptop.Chat, - org.vpri.EtoysActivity, - org.laptop.ImageViewerActivity, - org.laptop.sugar.Jukebox, - org.laptop.Log, - org.laptop.Pippy, - org.laptop.sugar.ReadActivity, - org.laptop.Terminal, - org.laptop.TurtleArtActivity, - org.laptop.AbiWordActivity, -favorite_activities = - org.laptop.WebActivity, - org.laptop.Calculate, - org.laptop.Chat, - org.vpri.EtoysActivity, - org.laptop.Pippy, - org.laptop.Terminal, - org.laptop.TurtleArtActivity, - org.laptop.AbiWordActivity, diff --git a/oob/xo-1.5.ini b/oob/xo-1.5.ini deleted file mode 100644 index 862e958..0000000 --- a/oob/xo-1.5.ini +++ /dev/null @@ -1,31 +0,0 @@ -[global] -target_platform = XO-1.5 - -modules = - base, - buildnr_from_file, - powerd, - x11, - xo1_5, - repos, - yumcfg, - sweets, - sd_card_image - -[repos] -olpc_frozen_1 = 1,local.%(olpc_version_major)s.%(olpc_version_minor)s.0-xo1.5 -olpc_frozen_2 = 1,local.%(olpc_version_major)s.%(olpc_version_minor)s.%(olpc_version_release)s-xo1.5 - -[yumcfg] -addrepo_1 = 1,local.0,http://mock.laptop.org/repos/local.%(olpc_version_major)s.%(olpc_version_minor)s.0-xo1.5 -addrepo_2 = 1,local,http://mock.laptop.org/repos/local.%(olpc_version_major)s.%(olpc_version_minor)s.%(olpc_version_release)s-xo1.5 - -[sd_card_image] -# 2GB image -size_1 = 1932735283,zd -keep_disk_image = 0 -compress_disk_image = 0 -make_zd = 1 - -[powerd] -enable_idle_suspend = 1 diff --git a/oob/xo-1.ini b/oob/xo-1.ini deleted file mode 100644 index e300657..0000000 --- a/oob/xo-1.ini +++ /dev/null @@ -1,25 +0,0 @@ -[global] -target_platform = XO-1 - -modules = - base, - buildnr_from_file, - powerd, - x11, - xo1, - repos, - yumcfg, - sweets, - jffs2_image - -[repos] -olpc_frozen_1 = 1,local.%(olpc_version_major)s.%(olpc_version_minor)s.0-xo1 -olpc_frozen_2 = 1,local.%(olpc_version_major)s.%(olpc_version_minor)s.%(olpc_version_release)s-xo1 - -[yumcfg] -addrepo_1 = 1,local.0,http://mock.laptop.org/repos/local.%(olpc_version_major)s.%(olpc_version_minor)s.0-xo1 -addrepo_2 = 1,local,http://mock.laptop.org/repos/local.%(olpc_version_major)s.%(olpc_version_minor)s.%(olpc_version_release)s-xo1 - -[powerd] -# still too many open blockers for XO-1 idle suspend to work well -enable_idle_suspend = 0 diff --git a/post.d/xsession.sh b/post.d/xsession.sh deleted file mode 100644 index 71d5056..0000000 --- a/post.d/xsession.sh +++ /dev/null @@ -1,5 +0,0 @@ -cat >/home/olpc/.xsession <