Version 0.4 Alpha Gold

4 files changed, 43 insertions, 37 deletions

diff --git a/oob/build-1.5.sh b/oob/build-1.5.sh
index 7f24dcd..bc41591 100644
--- a/oob/build-1.5.sh
+++ b/oob/build-1.5.sh
@@ -1 +1 @@
-olpc-os-builder xo-1.5.ini --additional-defaults include.ini
+olpc-os-builder xo-1.5.ini --additional-defaults include.ini 
diff --git a/oob/include.ini b/oob/include.ini
index 09fd203..b158e33 100644
--- a/oob/include.ini
+++ b/oob/include.ini
@@ -47,47 +47,48 @@ add_excludes_to = koji.dist-f14-i686,koji.dist-f14-i686-updates-%(olpc_version_m
 addrepo_01 = 1,olpc-f14,http://rpmdropbox.laptop.org/f14/
 add_excludes_to = fedora,fedora-updates,fedora-updates-testing
 
-[sugar]
-favorites_view_add=
-    org.laptop.WebActivity,
-    org.laptop.physics,
-    org.laptop.Memorize,
-    org.laptop.TamTamMini,
-    vu.lux.olpc.Speak,
-    org.vpri.EtoysActivity,
-    org.laptop.Oficina,
-    org.laptop.Maze,
-    org.laptop.AbiWordActivity,
-    org.eq.Fototoon,
-    org.ceibaljam.conozcoamerica,
-    org.laptop.RecordActivity,
-    org.laptop.sugar.GetBooksActivity,
-    org.laptop.Chat,
-    org.laptop.RecordActivity,
-    org.laptop.TurtleArtActivity,
-    org.laptop.Calculate,
-    org.laptop.physics,
-    org.gnome.Labyrinth,
-    org.laptop.community.TypingTurtle
+;[sugar]
+;favorites_view_add=
+;    org.laptop.WebActivity,
+;    org.laptop.physics,
+;    org.laptop.Memorize,
+;    org.laptop.TamTamMini,
+;    vu.lux.olpc.Speak,
+;    org.vpri.EtoysActivity,
+;    org.laptop.Oficina,
+;    org.laptop.Maze,
+;    org.laptop.AbiWordActivity,
+;    org.eq.Fototoon,
+;    org.ceibaljam.conozcoamerica,
+;    org.laptop.RecordActivity,
+;    org.laptop.sugar.GetBooksActivity,
+;    org.laptop.Chat,
+;    org.laptop.RecordActivity,
+;    org.laptop.TurtleArtActivity,
+;    org.laptop.Calculate,
+;    org.laptop.physics,
+;    org.gnome.Labyrinth,
+;    org.laptop.community.TypingTurtle
 
 [signing]
 extract=1
-bios_crypto_path=/home/icarito/hexokinase/bios-crypto-tools-0.5.20110622
-skey=/home/icarito/.ssh/masterkeys/fs
-okey=/home/icarito/.ssh/masterkeys/os
-;wkey=/root/masterkeys/fw
+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_packages]
 add_packages =
     sweets-desktop,
     sweets-locales,
     sugar-client,
     sweets,
+    vte,
+    sugar,
 ;   Sucrose
-    sugar-terminal,
-    sugar-browse,
+;    sugar-terminal,
+;    sugar-browse,
     etoys,
 ;   Additional sugar packages
     libxml2-python,
diff --git a/oob/latestbuild b/oob/latestbuild
index f11c82a..7c09198 100644
--- a/oob/latestbuild
+++ b/oob/latestbuild
@@ -1 +1 @@
-9
\ No newline at end of file
+37
\ No newline at end of file
diff --git a/oob/post.sh b/oob/post.sh
index bba2eee..ce551c1 100644
--- a/oob/post.sh
+++ b/oob/post.sh
@@ -27,10 +27,9 @@ $gconf_set --type bool   /desktop/sugar/show_logout false
 $gconf_set --type bool   /desktop/sugar/power/automatic true
 $gconf_set --type string /desktop/sugar/user/default_nick 'disabled'
 $gconf_set --type bool   /desktop/sugar/network/adhoc true
-$gconf_set --type string /desktop/sugar/collaboration/jabber_server ''
+$gconf_set --type string /desktop/sugar/collaboration/jabber_server 'pad.somosazucar.org'
 
 echo "echo 0 > /sys/class/net/eth0/lbs_mesh" >> etc/rc.local
-echo "18.85.44.120 api-testing.network.sugarlabs.org" >> etc/hosts
 
 cat > etc/sweets.conf << EOF
 [sweets]
@@ -60,12 +59,18 @@ cp opt/sweets/locales/locale-archive /usr/lib/locale/
 find lib -type d -name netfilter -exec rm -rf {} \; || true
 
 mkdir -p home/olpc/{Activities,Library}
-for bundle in $(ls $src_root/activities/*.xo); do
-    unzip -o -q $bundle -d home/olpc/Activities/
-done
+
+echo Installing home 
+# custom browser homepage
+mkdir -p usr/share/library-common
+cp $src_root/hx_home/*  usr/share/library-common/
 
 # Index Sugar Network local content to avoid doing that on the first startup
-sugar-network-service --activity-dirs=/home/olpc/Activities --local-root=/home/olpc/.sugar/default/network -DD index $PWD auto
+# and mark default favorites
+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
+
+sugar-network-service --activity-dirs=/home/olpc/Activities --local-root=/home/olpc/.sugar/default/network index $PWD org.laptop.WebActivity org.laptop.physics org.laptop.Memorize org.laptop.TamTamMini vu.lux.olpc.Speak org.vpri.EtoysActivity org.laptop.Oficina vu.lux.olpc.Maze org.laptop.AbiWordActivity org.eq.FotoToon org.ceibaljam.conozcoamerica org.laptop.RecordActivity org.laptop.sugar.GetBooksActivity org.laptop.Chat org.laptop.RecordActivity org.laptop.TurtleArtActivity org.laptop.Calculate org.laptop.physics org.gnome.Labyrinth org.laptop.community.TypingTurtle org.laptop.Pippy org.laptop.Terminal
 
 cat > home/olpc/.xsession << EOF
 exec sweets-sugar