Fixes for 0.9

8 files changed, 24 insertions, 178 deletions

diff --git a/deployment.spec b/deployment.spec
index 1e559fa..5520520 100644
--- a/deployment.spec
+++ b/deployment.spec
@@ -1,7 +1,7 @@
 # If package is named differently to "deployment", it should provide
 # "deployment" name to not brake "sweets" olpc-os-builder module
 Name: deployment
-Version: 0.1
+Version: 0.2
 Release: 1
 Group: Development/System
 Summary: Meta package for reference XO deployment distribution
@@ -36,8 +36,10 @@ cp AUTHORS COPYING README %{buildroot}/%{_datadir}/doc/%{name}/
 %files
 %defattr(-,root,root,-)
 %{_sysconfdir}/modprobe.d/libertas.conf
+%{_sysconfdir}/polkit-1/localauthority/50-local.d/deployment.pkla
 %{_sysconfdir}/X11/xorg.conf.d/zapnot.conf
 %{_sysconfdir}/sugar/blacklist/deployment
+%{_sysconfdir}/sweets.d/etc/PackageKit/PackageKit.conf
 %{_sysconfdir}/sweets.conf
 %{_datadir}/%{name}
 %{_datadir}/doc/%{name}
diff --git a/etc/sweets.conf b/etc/sweets.conf
index 96e83c5..eeb403f 100644
--- a/etc/sweets.conf
+++ b/etc/sweets.conf
@@ -1,30 +1,27 @@
 [shell]
 # space separated list of plugins to enable
-plugins = telepathy proxy sn 
+plugins = telepathy proxy sn
 
+# Sugar Network client configuration
+# http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Implementation#sugar-network-client
 [client]
 # url to connect to Sugar Network server API
 api-url = http://node.sugarlabs.org
 # space separated list of layers to restrict Sugar Network content by
+# for now, "pilot" layer is being used to QA most useful/stable activities
 layers = pilot
 
-# sugar-client configuration
-# http://wiki.sugarlabs.org/go/Platform_Team/Server_Kit/sugar-client
-[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
+# Default parameters for sugar-plugin-stats package
+[sugar-plugin-stats]
 # 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
+# if more than 0, upload collected usage statistics to
+# a 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 = 86400
+
+# 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 = 86400
diff --git a/image/common_light.ini b/image/common_light.ini
deleted file mode 100644
index e147177..0000000
--- a/image/common_light.ini
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# Common configuration for all XO models.
-#
-
-[global]
-# Image title.
-# Put your title here.
-customization_info = Hexoquinasa XO distribution
-fedora_release = 14
-
-# 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 = hxp%%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_required =
-    base,
-    repos,
-    yumcfg,
-    powerd,
-    x11,
-#   Include Sweets Distribution specific settings.
-    sweets
-
-# Useful extra modules.
-modules_extra =
-#   Keep current build number in path set by [buildnr_from_file].
-    buildnr_from_file,
-#   Add rpmfusion repositories to image build time and image itself.
-    rpmfusion,
-#   To add extra packages from [custom_packages] section.
-    custom_packages,
-    custom_scripts,
-    signing
-
-[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
-fedora_release = 14
-
-# Url to downstream repository. Put your url here.
-deployment_repository_url = http://download.sugarlabs.org/packages//Hexoquinasa:/1/SweetsDistribution_Factory_Fedora-14/
-# deployment_repository_url = http://download.sugarlabs.org/packages/SweetsDistribution:/Factory:/ReferenceXO/Fedora-%(fedora_release)s/
-
-# Sugar Network layer to restrict list of activities and their versions
-# Use Contributor Hub application to set what content should be in such layer
-# TODO Make sugar that his layer is the same as in etc/sweets.conf
-sugar_network_layer = pilot
-
-# 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 the Sugar Network. If activities
-# were formed properly, their dependencies will be automatically installed.
-# 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,
-    org.laptop.sugar.Jukebox,
-    org.worldwideworkshop.olpc.JigsawPuzzle,
-    org.laptop.TamTamMini,
-    org.laptop.Memorize,
-    org.gnome.Labyrinth,
-    org.laptop.RecordActivity,
-    org.laptop.Oficina,
-    com.jotaro.ImplodeActivity,
-    org.laptop.physics,
-    org.laptop.MeasureActivity,
-    org.laptop.VncLauncher,
-#net.gcompris,
-#edu.mit.media.ScratchActivity,
-    org.ceibaljam.conozcoamerica,
-    org.sugarlabs.ICanReadActivity,
-    org.ceibaljam.terronesweeper,
-    org.sugarlabs.SimpleGraph,
-    org.ceibaljam.jamedit,
-    org.laptop.TurtleArtButia,
-    vu.lux.olpc.Speak,
-    org.ceibaljam.agenda,
-    org.laptop.WikipediaActivity
-
-# 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.WikipediaActivity,
-    org.laptop.RecordActivity,
-    org.laptop.Calculate,
-    org.laptop.Chat,
-    org.laptop.TurtleArtActivity,
-    org.laptop.AbiWordActivity,
-    org.laptop.physics,
-    org.laptop.TamTamMini,
-    org.ceibaljam.conozcoamerica,
-    org.laptop.Terminal
-
-[custom_packages]
-add_packages =
-#   Useful packages from rpmfusion repository.
-    gstreamer-plugins-ugly,
-    gstreamer-ffmpeg,
-    mplayer,
-    x11vnc
-
-[signing]
-extract=1
-bios_crypto_path=/root/bios-crypto
-skey=/root/bios-crypto/build/masterkeys/fs
-okey=/root/bios-crypto/build/masterkeys/os
-wkey=/root/bios-crypto/build/masterkeys/fw
-make_img_fs_zip=1
-
-[custom_scripts]
-custom_script_1 = %(oob_config_dir)s/post.sh
diff --git a/image/latestbuild b/image/latestbuild
index 8bc6583..a09fd8a 100644
--- a/image/latestbuild
+++ b/image/latestbuild
@@ -1 +1 @@
-120
\ No newline at end of file
+124
\ No newline at end of file
diff --git a/image/post.sh b/image/post.sh
index b38feb5..2ba14b2 100755
--- a/image/post.sh
+++ b/image/post.sh
@@ -3,24 +3,10 @@
 src_root=$(dirname $0)
 cd ${INSTALL_ROOT}
 
-#for i in $(ls $src_root/../activities/*.xo); do HOME=home/olpc sugar-install-bundle $i; done
-#for i in `find home/olpc/.local -type l`; do ln -fs /$(readlink $i) $i; done
-
 echo Installing homepage
 # custom browser homepage
 mkdir -p usr/share/library-common
 cp $src_root/../hx_home/*  usr/share/library-common/
 
-echo Installing boot-anim 
+#TODO Installing boot-anim 
 # custom bootscreen 
-mkdir -p usr/share/library-common
-cp $src_root/../hx_home/*  usr/share/library-common/
-
-echo Setting language 
-cat > home/olpc/.i18n <<EOF
-LANG="es_PE.utf8"
-LANGUAGE="es_PE.utf8"
-EOF
-
-creds=$(ls -aldn home/olpc | awk '{print $3 ":" $4}')
-chown ${creds} -R home/olpc
diff --git a/image/xo-1.5.ini b/image/xo-1.5.ini
index 25d4d79..b5c286f 100644
--- a/image/xo-1.5.ini
+++ b/image/xo-1.5.ini
@@ -29,4 +29,3 @@ olpc_frozen_1 = 1,local.11.3.1
 olpc_frozen_2 = 1,local.11.3.0-xo1.5
 olpc_frozen_3 = 1,local.11.3.1-xo1.5
 add_excludes_to = fedora,fedora-updates,fedora-updates-testing
-
diff --git a/image/xo-1.ini b/image/xo-1.ini
index 75e527e..0196248 100644
--- a/image/xo-1.ini
+++ b/image/xo-1.ini
@@ -20,5 +20,4 @@ fedora = fedora,fedora_updates
 olpc_frozen_1 = 1,local.11.3.1
 olpc_frozen_2 = 1,local.11.3.0-xo1
 olpc_frozen_3 = 1,local.11.3.1-xo1
-add_excludes_to = fedora,fedora-updates,fedora-updates-testing
-
+add_excludes_to = fedora,fedora-updates,fedora-updates-testing
\ No newline at end of file
diff --git a/post.d/rc.sh b/post.d/rc.sh
index 9702e36..c91fae3 100644
--- a/post.d/rc.sh
+++ b/post.d/rc.sh
@@ -1,5 +1,6 @@
-grep locale_archive /etc/rc.local >/dev/null || cat >>/etc/rc.local <<EOF
-# locale-archive might be overriden by glibc updates
-locale_archive=/opt/sweets/locales/locale-archive
-[ -e \$locale_archive ] && cp \$locale_archive /usr/lib/locale/
+grep sweets.d /etc/rc.local >/dev/null || cat >>/etc/rc.local <<EOF
+for i in \$(find /etc/sweets.d -type f -printf "%P\n"); do
+    [ /etc/sweets.d/\$i -nt /\$i ] && cp -a /etc/sweets.d/\$i /\$i
+done
 EOF
+. /etc/rc.local