Merge branch 'master' of ssh://oficina.paraguayeduca.org:24/git/users/bernie/olpc-os-builder

Conflicts:
	examples/f11-xo1-py.ini

10 files changed, 44 insertions, 22 deletions

diff --git a/modules/base/build.40.imagecreate.py b/modules/base/build.40.imagecreate.py
index e4ee881..5a9b4c0 100644
--- a/modules/base/build.40.imagecreate.py
+++ b/modules/base/build.40.imagecreate.py
@@ -16,7 +16,7 @@ def main():
 
     buildnr_path = os.path.join(ooblib.intermediatesdir, 'buildnr')
     image_num = open(buildnr_path, "r").readline()
-    image_name = "os%d" % int(image_num)
+    image_name = "os" + image_num.strip()
 
     kspath = os.path.join(ooblib.intermediatesdir, 'build.ks')
     ks = imgcreate.read_kickstart(kspath)
diff --git a/modules/base/kspkglist.10.core.inc b/modules/base/kspkglist.10.core.inc
index bc0ba90..95d39b8 100644
--- a/modules/base/kspkglist.10.core.inc
+++ b/modules/base/kspkglist.10.core.inc
@@ -15,12 +15,20 @@ strace
 olpc-utils
 olpc-netutils
 olpc-bootanim
+
 olpc-update
+
 PolicyKit-olpc
 ds-backup-client
-olpc-powerd
+
+#bernie: we're not yet ready for powerd
+#olpc-powerd
+ohm
+
 bootfw
-olpc-runin-tests
+
+#bernie: wtf is this?
+#olpc-runin-tests
 
 # graphical base environment
 olpc-kbdshim
diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc
index 40c7483..d7d19d1 100644
--- a/modules/base/kspost.10.core.inc
+++ b/modules/base/kspost.10.core.inc
@@ -1,14 +1,14 @@
 # from the liveuser script
 # and add /ofw
-# and limit tmpfs mounts to 5%
+# and limit tmpfs mounts to 15%
 cat >> /etc/fstab <<EOF
-/tmp            /tmp            tmpfs         rw,size=5%  0 0
+/tmp            /tmp            tmpfs         rw,size=15%  0 0
 varcacheyum     /var/cache/yum  tmpfs         rw,mode=755 0 0
-vartmp          /var/tmp        tmpfs         rw,size=5%  0 0
+vartmp          /var/tmp        tmpfs         rw,size=15%  0 0
 varlog          /var/log        tmpfs         rw,size=2%  0 0
 none            /ofw            promfs		  defaults    0 0
 EOF
-sed -i -e '/\/dev\/shm/ s/ defaults / defaults,size=5% /' /etc/fstab
+sed -i -e '/\/dev\/shm/ s/ defaults / defaults,size=15% /' /etc/fstab
 
 mkdir /ofw
 mkdir /bootpart
diff --git a/modules/buildnr_from_file/cleanup.50.write_buildnr.sh b/modules/buildnr_from_file/cleanup.50.write_buildnr.sh
index 5acb0fc..3153156 100644
--- a/modules/buildnr_from_file/cleanup.50.write_buildnr.sh
+++ b/modules/buildnr_from_file/cleanup.50.write_buildnr.sh
@@ -2,8 +2,10 @@
 # Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
 
 . $OOB__shlib
-buildnr=$(read_buildnr)
 path=$(read_config buildnr_from_file path)
 
-[ -n "$path" ] && echo -n $buildnr > $path
-
+if [ -n "$path" ]; then
+	nr=$(<$path)
+	(( nr++ ))
+	echo -n $nr > $path
+fi
diff --git a/modules/library_homepage/kspost.50.nochroot.library.sh b/modules/library_homepage/kspost.50.nochroot.library.sh
index 8874683..08c1982 100644
--- a/modules/library_homepage/kspost.50.nochroot.library.sh
+++ b/modules/library_homepage/kspost.50.nochroot.library.sh
@@ -16,9 +16,4 @@ if [ ! -d "$path" ]; then
 fi
 
 # synchronize the files within the path, conserving directory structure
-pushd "$path" >/dev/null
-find . -type f -print0 | while read -d $'\0' file; do
-	echo "cp \"$path\"/\"$file\" \$INSTALL_ROOT/usr/share/library-common/\"$file\""
-done
-popd >/dev/null
-
+echo "rsync -a \"$path\"/ \"\$INSTALL_ROOT/usr/share/library-common/\""
diff --git a/modules/sugar/kspkglist.50.sugar.inc b/modules/sugar/kspkglist.50.sugar.inc
index 3c78de0..52037b2 100644
--- a/modules/sugar/kspkglist.50.sugar.inc
+++ b/modules/sugar/kspkglist.50.sugar.inc
@@ -33,4 +33,3 @@ olpc-library
 # components, otherwise the KDE ones will be brought in by default
 PolicyKit-gnome
 notification-daemon
-
diff --git a/modules/sugar/kspost.50.gconf.inc b/modules/sugar/kspost.50.gconf.inc
index 44dfd6c..2a01cd3 100644
--- a/modules/sugar/kspost.50.gconf.inc
+++ b/modules/sugar/kspost.50.gconf.inc
@@ -4,8 +4,17 @@ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults
 # disable logout button in Sugar
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false
 
-# set sugar power management on
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic true
+# set sugar power management off
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic false
+
+# set sugar power management off also where ohmd will actually look for it
+gconftool-2 --direct --config-source xml:readwrite:/home/olpc/.gconf -s -t bool /desktop/sugar/power/automatic false
+chown -R olpc:olpc /home/olpc/.gconf
+
+# same for powerd
+mkdir -p /etc/powerd/flags
+> /etc/powerd/flags/inhibit-suspend
+chown -R olpc:olpc /etc/powerd/flags
 
 # set empty jabber server so that no gabble connection is attempted by default
 gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type string --set /desktop/sugar/collaboration/jabber_server ''
diff --git a/modules/sugar_activity_group/kspost.60.nochroot.activities.py b/modules/sugar_activity_group/kspost.60.nochroot.activities.py
index bec62cd..1c51d44 100644
--- a/modules/sugar_activity_group/kspost.60.nochroot.activities.py
+++ b/modules/sugar_activity_group/kspost.60.nochroot.activities.py
@@ -154,7 +154,10 @@ def parse_url(url, **urlopen_args):
     `bitfrost.util.urlrange.urlopen`."""
     import bitfrost.util.urlrange as urlrange
     with urlrange.urlopen(url, **urlopen_args) as f:
-        return parse_html(f.read(), f.url)
+	try:
+            return parse_html(f.read(), f.url)
+	except urllib2.HTTPError:
+            return None, None, []
 
 def generate_install_cmd(path):
     if path.endswith(".xol"):
diff --git a/modules/sugarlabs_activities/kspost.60.nochroot.aslo.sh b/modules/sugarlabs_activities/kspost.60.nochroot.aslo.sh
index d040168..12dd39b 100644
--- a/modules/sugarlabs_activities/kspost.60.nochroot.aslo.sh
+++ b/modules/sugarlabs_activities/kspost.60.nochroot.aslo.sh
@@ -26,9 +26,9 @@ for id in $activities; do
 
 	outfile=$cache/$(basename "$aurl")
 	if [ "${outfile:(-4)}" == ".xol" ]; then
-        echo "unzip -d \$INSTALL_ROOT/home/olpc/Library -q '$outfile'"
+		echo "unzip -d \$INSTALL_ROOT/home/olpc/Library -q '$outfile'"
 	else
-        echo "unzip -d \$INSTALL_ROOT/home/olpc/Activities -q '$outfile'"
+		echo "unzip -d \$INSTALL_ROOT/home/olpc/Activities -q '$outfile'"
 	fi
 done
 IFS=$oIFS
diff --git a/modules/xo1/kspkglist.50.xo1.inc b/modules/xo1/kspkglist.50.xo1.inc
index 0a17618..06bc2b1 100644
--- a/modules/xo1/kspkglist.50.xo1.inc
+++ b/modules/xo1/kspkglist.50.xo1.inc
@@ -1,2 +1,8 @@
 xorg-x11-drv-geode
 
+# These are cool, but they take up a lot of space
+#-gimp
+#-audacity
+#-inkscape
+
+olpc-contents