From a24dde05bdfdddfaaa7eba09ae6981930fc3c6f7 Mon Sep 17 00:00:00 2001 From: Sebastian Silva (icarito) Date: Sat, 14 Jul 2012 05:40:14 +0000 Subject: Setup for initial XO1.5 released build --- diff --git a/oob/activities.txt b/oob/activities.txt new file mode 100644 index 0000000..d8a447b --- /dev/null +++ b/oob/activities.txt @@ -0,0 +1,43 @@ +http://activities.sugarlabs.org/es-ES/sugar/downloads/latest/4063/addon-4063-latest.xo?src=homepagebrowse +http://activities.sugarlabs.org/es-ES/sugar/downloads/latest/4027/addon-4027-latest.xo?src=addondetail +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/27651/tux_paint-6.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28098/cartoon_builder-17.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28096/fototoon-13.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28144/measure-42.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28114/clock-9.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28102/speak-41.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28086/log-29.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28071/i_know_america-5.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28135/terminal-40.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28015/write-79.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28020/paint-43.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/27634/read-92.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/27956/get_books-11.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28131/portfolio-26.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28099/chat-77.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28025/moon-14.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/27420/irc-10.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/27877/poll-28.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/27998/tamtamedit-63.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/27999/tamtamjam-63.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28000/tamtammini-63.xo +http://people.sugarlabs.org/rafael/UY/Browse-129.3.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28139/labyrinth-14.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28026/calculate-40.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28087/maze-21.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28134/pippy-49.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28115/jukebox-26.xo +http://activities-testing.sugarlabs.org/es-ES/sugar/downloads/file/27154/physics-8.xo +http://activities-testing.sugarlabs.org/es-ES/sugar/downloads/file/26891/infoslicer-8.xo +http://activities-testing.sugarlabs.org/es-ES/sugar/downloads/file/26730/GComprisSudoku-13.xo +http://activities-testing.sugarlabs.org/es-ES/sugar/downloads/file/26744/GComprisTangram-13.xo +http://activities-testing.sugarlabs.org/es-ES/sugar/downloads/file/27157/spirolaterals-14.xo +http://activities-testing.sugarlabs.org/es-ES/sugar/downloads/latest/4026/addon-4026-latest.xo?src=category +http://wiki.laptop.org/images/8/86/Scratch-23.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/26492/etoys-113.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/file/28106/stopwatch-16.xo +http://activities.sugarlabs.org/es-ES/sugar/downloads/latest/4081/addon-4081-latest.xo?src=addondetail +http://activities.sugarlabs.org/es-ES/sugar/downloads/latest/4026/addon-4026-latest.xo?src=addondetail +http://activities.sugarlabs.org/en-US/sugar/downloads/latest/4507/addon-4507-latest.xo?src=addondetail +http://activities.sugarlabs.org/en-US/sugar/downloads/latest/4527/addon-4527-latest.xo?src=addondetail +http://activities.sugarlabs.org/es-ES/sugar/downloads/latest/4447/addon-4447-latest.xo?src=addondetail diff --git a/oob/build-1.5.sh b/oob/build-1.5.sh new file mode 100644 index 0000000..7f24dcd --- /dev/null +++ b/oob/build-1.5.sh @@ -0,0 +1 @@ +olpc-os-builder xo-1.5.ini --additional-defaults include.ini diff --git a/oob/build-1.sh b/oob/build-1.sh new file mode 100644 index 0000000..be325e9 --- /dev/null +++ b/oob/build-1.sh @@ -0,0 +1 @@ +olpc-os-builder xo-1.ini --additional-defaults include.ini diff --git a/oob/download_activities.sh b/oob/download_activities.sh new file mode 100644 index 0000000..ab65df6 --- /dev/null +++ b/oob/download_activities.sh @@ -0,0 +1,7 @@ +#!/bin/sh +cd activities + +for i in `cat ../activities.txt` +do + wget $i +done diff --git a/oob/include.ini b/oob/include.ini index e3a4acf..09fd203 100644 --- a/oob/include.ini +++ b/oob/include.ini @@ -4,8 +4,8 @@ olpc_version_minor = 3 olpc_version_release = 1 [global] -customization_info = Hexokinase Factory -image_name = hf%%d +customization_info = Hexoquinasa Peru +image_name = hxp%%d fedora_release = 14 modules = @@ -17,10 +17,11 @@ modules = x11, custom_packages, custom_scripts, + signing, %(global_modules)s -# Locales will be replaced by sweets-locales anyway -langs = en_US +; Locales will be replaced by sweets-locales anyway +langs = es [base] versioned_fs = 0 @@ -46,16 +47,49 @@ 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 + +[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 +make_img_fs_zip=1 + + [custom_packages] add_packages = sweets-desktop, sweets-locales, + sugar-client, sweets, -# Sucrose +; Sucrose sugar-terminal, sugar-browse, etoys, -# Additional sugar packages +; Additional sugar packages libxml2-python, hulahop, pyabiword, @@ -71,22 +105,24 @@ add_packages = csound-python, pygame, python-alsaaudio, -# Browse +; Browse gnome-python2-gnome, gnash-plugin, totem-mozplugin, -# dependencies for Epub support in Read +; dependencies for Epub support in Read pywebkitgtk, python-BeautifulSoup, python-lxml, -# for Tuxmath activity +; for Tuxmath activity SDL_Pango, -# for Physics +; for Physics pybox2d, -# for text-to-speech in Read +; for text-to-speech in Read gstreamer-plugins-espeak, -# standard part of of PyGTK, used by some activities (OLPC#11053) +; standard part of of PyGTK, used by some activities (OLPC#11053) pygtk2-libglade +; for classroombroadcast + x11vnc del_packages = at, diff --git a/oob/latestbuild b/oob/latestbuild index bf0d87a..f11c82a 100644 --- a/oob/latestbuild +++ b/oob/latestbuild @@ -1 +1 @@ -4 \ No newline at end of file +9 \ No newline at end of file diff --git a/oob/post.sh b/oob/post.sh index 33ec8fa..bba2eee 100644 --- a/oob/post.sh +++ b/oob/post.sh @@ -27,8 +27,10 @@ $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 '' 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] @@ -38,9 +40,16 @@ sugar-network = True [local] # url to connect to Sugar Network server API # make it empty to discover local servers via Avahi -api-url = +api-url = http://api-testing.network.sugarlabs.org # start server to share local documents server-mode = False + +[client] +# optional command-line arguments to pass to packager while unattended updating +# the system +update-args = --disablerepo=* --enablerepo=SweetsDistribution --enablerepo=SweetsDistribution:Factory +# if more than 0, do regular unattended updates with specified delay in seconds +update-timeout = 86400 EOF # modules.d/base swipes locale-archive @@ -52,11 +61,11 @@ 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 -q $bundle -d home/olpc/Activities/ + unzip -o -q $bundle -d home/olpc/Activities/ done # Index Sugar Network local content to avoid doing that on the first startup -sugar-network-service -DD index . olpc auto +sugar-network-service --activity-dirs=/home/olpc/Activities --local-root=/home/olpc/.sugar/default/network -DD index $PWD auto cat > home/olpc/.xsession << EOF exec sweets-sugar -- cgit v0.9.1