diff options
| author | Aleksey Lim <alsroot@sugarlabs.org> | 2012-07-14 18:11:05 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2012-07-14 18:11:05 (GMT) |
| commit | 4567d754481cc9cfda1d58abcc17d75f6179821d (patch) | |
| tree | 1acd50435c5cf0aa89c1c5fcd4b94e806c6db29b | |
| parent | 9526da48f7de87678dd665c52b8ffd1cd70ec7fc (diff) | |
Bump r6
| -rw-r--r-- | oob/include.ini | 16 | ||||
| -rw-r--r-- | oob/latestbuild | 2 | ||||
| -rw-r--r-- | oob/post.sh | 31 |
3 files changed, 35 insertions, 14 deletions
diff --git a/oob/include.ini b/oob/include.ini index e3a4acf..6379b9e 100644 --- a/oob/include.ini +++ b/oob/include.ini @@ -40,6 +40,7 @@ olpc_frozen_02 = 0,koji.dist-f14-i686-updates-%(olpc_version_major)s.%(olpc_vers olpc_frozen_03 = 1,local.%(olpc_version_major)s.%(olpc_version_minor)s.%(olpc_version_release)s custom_repo_10 = 1,SweetsDistribution,http://download.sugarlabs.org/packages/SweetsDistribution/Fedora-14/ custom_repo_11 = 1,SweetsDistribution:Factory,http://download.sugarlabs.org/packages/SweetsDistribution:/Factory/Fedora-14/ +custom_repo_12 = 1,rpmfusion,http://download1.rpmfusion.org/free/fedora/releases/14/Everything/i386/os/ add_excludes_to = koji.dist-f14-i686,koji.dist-f14-i686-updates-%(olpc_version_major)s.%(olpc_version_minor)s.%(olpc_version_release)s [yumcfg] @@ -51,11 +52,12 @@ add_packages = sweets-desktop, sweets-locales, sweets, -# Sucrose - sugar-terminal, - sugar-browse, - etoys, +# Fructose problematic activities + sugar-read, + sugar-write, + etoys-sugar, # Additional sugar packages + vte, libxml2-python, hulahop, pyabiword, @@ -86,7 +88,11 @@ add_packages = # for text-to-speech in Read gstreamer-plugins-espeak, # standard part of of PyGTK, used by some activities (OLPC#11053) - pygtk2-libglade + pygtk2-libglade, +# rpmfusion + gstreamer-plugins-ugly, + gstreamer-ffmpeg, + mplayer del_packages = at, diff --git a/oob/latestbuild b/oob/latestbuild index bf0d87a..62f9457 100644 --- a/oob/latestbuild +++ b/oob/latestbuild @@ -1 +1 @@ -4
\ No newline at end of file +6
\ No newline at end of file diff --git a/oob/post.sh b/oob/post.sh index 33ec8fa..190e8cd 100644 --- a/oob/post.sh +++ b/oob/post.sh @@ -38,11 +38,21 @@ 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 EOF +cat >> etc/hosts << EOF +# Until resolving #3753 +18.85.44.120 api-testing.network.sugarlabs.org +18.85.44.120 api-devel.network.sugarlabs.org +18.85.44.120 api.network.sugarlabs.org +18.85.44.120 network-testing.sugarlabs.org +18.85.44.120 api.network-devel.sugarlabs.org +18.85.44.120 api.network.sugarlabs.org +EOF + # modules.d/base swipes locale-archive cp opt/sweets/locales/locale-archive /usr/lib/locale/ @@ -52,20 +62,25 @@ 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 \ + --local-root=/home/olpc/.sugar/default/network \ + --activity-dirs=/home/olpc/Activities:/usr/share/sugar/activities \ + index $PWD \ + org.laptop.Calculate \ + org.laptop.Chat \ + org.laptop.Pippy \ + org.laptop.TurtleArtActivity \ + org.laptop.WebActivity \ + org.laptop.AbiWordActivity \ + org.vpri.EtoysActivity cat > home/olpc/.xsession << EOF exec sweets-sugar EOF -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 |