Merge remote branch 'origin/master'

Conflicts:
	modules/base/kspkglist.10.core.inc
	modules/base/kspost.10.core.inc
	modules/signing/finalize.50.makefszip_img.sh

16 files changed, 64 insertions, 35 deletions

diff --git a/modules/base/README b/modules/base/README
index 5f65e01..5a8bb87 100644
--- a/modules/base/README
+++ b/modules/base/README
@@ -13,9 +13,11 @@ from the image in /versions/pristine. This will be done at first-boot time
 otherwise, but given that it takes a minute or more, it is a fair improvement
 to do it at build time.
 
-- make_iso (default 1)
-Set to 0 to disable generation of a .iso file in the output directory.
-This .iso can be used on a regular system as a LiveCD.
+- make_iso (default 0)
+Set to 1 to enable generation of a .iso file in the output directory.
+This .iso may or may not function on a regular system as a LiveCD.
+dm-snapshot support is required on the build system (both the userspace
+utilities and kernel level support).
 
 - compress_iso (default 1)
 Set to 0 to disable squashfs compression of the filesystem on the .iso LiveCD.
diff --git a/modules/base/defaults.ini b/modules/base/defaults.ini
index 8c9507f..78783eb 100644
--- a/modules/base/defaults.ini
+++ b/modules/base/defaults.ini
@@ -13,7 +13,7 @@ official=0
 [base]
 versioned_fs=1
 prepopulate_run=1
-make_iso=1
+make_iso=0
 compress_iso=1
 make_tree_tarball=1
 python_optimize=2
diff --git a/modules/base/kspkglist.10.core.inc b/modules/base/kspkglist.10.core.inc
index 12095b1..faa3240 100644
--- a/modules/base/kspkglist.10.core.inc
+++ b/modules/base/kspkglist.10.core.inc
@@ -21,12 +21,9 @@ olpc-update
 PolicyKit-olpc
 ds-backup-client
 olpc-powerd
-
+olpc-powerd-dbus
 bootfw
 
-#bernie: wtf is this?
-#olpc-runin-tests
-
 # graphical base environment
 olpc-kbdshim
 desktop-backgrounds-basic
diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc
index c2be715..ba0744b 100644
--- a/modules/base/kspost.10.core.inc
+++ b/modules/base/kspost.10.core.inc
@@ -2,13 +2,13 @@
 # and add /ofw
 # and limit tmpfs mounts to 15%
 cat >> /etc/fstab <<EOF
-/tmp            /tmp            tmpfs         rw,size=15%  0 0
+/tmp            /tmp            tmpfs         rw,size=150m 0 0
 varcacheyum     /var/cache/yum  tmpfs         rw,mode=755 0 0
-vartmp          /var/tmp        tmpfs         rw,size=15%  0 0
-varlog          /var/log        tmpfs         rw,size=2%  0 0
+vartmp          /var/tmp        tmpfs         rw,size=150m 0 0
+varlog          /var/log        tmpfs         rw,size=20m 0 0
 none            /ofw            promfs		  defaults    0 0
 EOF
-sed -i -e '/\/dev\/shm/ s/ defaults / defaults,size=15% /' /etc/fstab
+sed -i -e '/\/dev\/shm/ s/ defaults / defaults,size=150m /' /etc/fstab
 
 mkdir /ofw
 mkdir /bootpart
@@ -92,21 +92,6 @@ EOF
 # this allows olpc-configure to set a hostname based on the MAC address
 echo "NM_IGNORE_HOSTNAME_LOCALHOST=yes" >> /etc/sysconfig/network
 
-# FIXME: fix this bug and remove this hack
-cat >/etc/NetworkManager/dispatcher.d/adhoc-route <<EOF
-#!/bin/sh
-# workaround for http://dev.laptop.org/ticket/9669
-[ "\$1" = "eth0" ] || exit 0
-if [ "\$2" = "down" ]; then
-	/sbin/ip route del 224.0.0.0/4 dev eth0 &>/dev/null
-else
-	/sbin/iwconfig \$1 | /bin/grep -q "Mode:Ad-Hoc" && \
-		/sbin/ip route add 224.0.0.0/4 dev eth0 &>/dev/null
-fi
-exit 0
-EOF
-chmod a+x /etc/NetworkManager/dispatcher.d/adhoc-route
-
 # OLPC CA certificate (#9624)
 # this is used by wget, but the Web activity uses cert8.db in its own
 # installation (which is then copied into user's profile dir)
diff --git a/modules/buildnr_from_file/prepare.10.buildnr.sh b/modules/buildnr_from_file/prepare.10.buildnr.sh
index 1e00e94..e523005 100644
--- a/modules/buildnr_from_file/prepare.10.buildnr.sh
+++ b/modules/buildnr_from_file/prepare.10.buildnr.sh
@@ -7,7 +7,9 @@ nr=0
 path=$(read_config buildnr_from_file path)
 [ -n "$path" -a -e "$path" ] && nr=$(<$path)
 
-(( nr++ ))
+# increment and ignore return value. new versions of bash return the new
+# value of the variable which is usually non-zero.
+(( nr++ )) || :
 
 echo $nr > $intermediatesdir/buildnr
 
diff --git a/modules/gnome/kspost.50.gconf.inc b/modules/gnome/kspost.50.gconf.inc
index 22b45c4..9a706ee 100644
--- a/modules/gnome/kspost.50.gconf.inc
+++ b/modules/gnome/kspost.50.gconf.inc
@@ -24,3 +24,9 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
 # disable annoying pop-ups from IM settings daemon (we use our own IM settings mechanism for now)
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/imsettings-applet/notify_on_bubble false
 
+# Set Nautilus to browser mode by default
+gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type bool --set /apps/nautilus/preferences/always_use_browser true
+
+# Remove email-launcher icon from panel
+gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type list --list-type string --set  /apps/panel/general/object_id_list [menu_bar,web_launcher]
+
diff --git a/modules/jffs2_image/image.50.makeimg.sh b/modules/jffs2_image/image.50.makeimg.sh
index 311d0f6..3d20246 100644
--- a/modules/jffs2_image/image.50.makeimg.sh
+++ b/modules/jffs2_image/image.50.makeimg.sh
@@ -8,7 +8,8 @@ versioned_fs=$(read_config base versioned_fs)
 
 tmpdir=$intermediatesdir/jffs2-fs
 tmpimg=$intermediatesdir/jffs2tmp.img
-img=$outputdir/os$buildnr.img
+outfile=os$buildnr.img
+img=$outputdir/$outfile
 
 
 echo "Copying image contents..."
@@ -31,3 +32,6 @@ echo "Creating checksums..."
 sumtool -n -p -e 128KiB -i $tmpimg -o $img
 $bindir/crcimg $img
 
+pushd $outputdir >/dev/null
+md5sum $outfile > $outfile.md5
+popd >/dev/null
diff --git a/modules/powerd/README b/modules/powerd/README
new file mode 100644
index 0000000..37ee7c1
--- /dev/null
+++ b/modules/powerd/README
@@ -0,0 +1,10 @@
+This module allows for customization of the configuration of powerd,
+the OLPC-developed power management controller.
+
+By default, powerd will automatically suspend the XO after a period of
+inactivity. If you wish to disable this behaviour, you can include the
+following configuration option:
+
+[powerd]
+enable_idle_suspend=0
+
diff --git a/modules/powerd/defaults.ini b/modules/powerd/defaults.ini
new file mode 100644
index 0000000..dde3e76
--- /dev/null
+++ b/modules/powerd/defaults.ini
@@ -0,0 +1,3 @@
+[powerd]
+enable_idle_suspend=1
+
diff --git a/modules/powerd/kspost.50.autosuspend.sh b/modules/powerd/kspost.50.autosuspend.sh
new file mode 100644
index 0000000..8a2b9c5
--- /dev/null
+++ b/modules/powerd/kspost.50.autosuspend.sh
@@ -0,0 +1,10 @@
+# Copyright (C) 2010 One Laptop Per Child
+# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
+
+. $OOB__shlib
+
+idle_suspend_enabled=$(read_config powerd enable_idle_suspend)
+if [[ "$idle_suspend_enabled" != 1 ]]; then
+	echo "touch /etc/powerd/flags/inhibit-suspend"
+fi
+
diff --git a/modules/sd_card_image/postimage.50.makezd.sh b/modules/sd_card_image/postimage.50.makezd.sh
index dc66dd0..de25339 100644
--- a/modules/sd_card_image/postimage.50.makezd.sh
+++ b/modules/sd_card_image/postimage.50.makezd.sh
@@ -22,6 +22,11 @@ for line in $(env); do
 	echo "Making ZD image for $osname..."
 	$bindir/zhashfs 0x20000 sha256 $pfx.disk.img $pfx.zsp $pfx.zd
 
+	echo "Creating MD5sum of $osname.zd..."
+	pushd $outputdir >/dev/null
+	md5sum $osname.zd > $osname.zd.md5
+	popd >/dev/null
+
 	if [[ "$compress" == "1" ]]; then
 		echo "Compressing disk image..."
 		tar -czS -f $pfx.disk.img.tar.gz -C $outputdir $osname.disk.img
diff --git a/modules/signing/finalize.50.makefszip_img.sh b/modules/signing/finalize.50.makefszip_img.sh
index ddc1683..20c59d6 100644
--- a/modules/signing/finalize.50.makefszip_img.sh
+++ b/modules/signing/finalize.50.makefszip_img.sh
@@ -33,9 +33,8 @@ make_signed_img()
 	echo "Generating signed fs.zip for $(basename $1)..."
 	local outfile=$outputdir/$(basename $1).fs.zip
 	pushd $bios_crypto/build
-	rm -rf $bios_crypto/build/fs.zip
-	$bios_crypto/build/make-fs.sh --signingkey $skey $1
-	mv $bios_crypto/build/fs.zip $outfile
+	./make-fs.sh --signingkey $skey $1
+	mv fs.zip $outfile
 	popd
 }
 
diff --git a/modules/sugar/kspkglist.50.sugar.inc b/modules/sugar/kspkglist.50.sugar.inc
index b860d72..41a5f1e 100644
--- a/modules/sugar/kspkglist.50.sugar.inc
+++ b/modules/sugar/kspkglist.50.sugar.inc
@@ -20,6 +20,7 @@ python-json
 squeak-vm
 # Browse
 gnome-python2-gnome
+gnash-plugin
 totem-mozplugin
 -totem-xine
 -xine-lib
diff --git a/modules/sugar_activity_group/kspost.60.nochroot.activities.py b/modules/sugar_activity_group/kspost.60.nochroot.activities.py
index 5a85961..b844041 100644
--- a/modules/sugar_activity_group/kspost.60.nochroot.activities.py
+++ b/modules/sugar_activity_group/kspost.60.nochroot.activities.py
@@ -236,5 +236,6 @@ if systemwide:
 	print "echo '%s' > $INSTALL_ROOT/etc/olpc-update/activity-groups" % baseurl
 else:
 	print "echo '%s' > $INSTALL_ROOT/home/olpc/Activities/.groups" % baseurl
-	print "chown -R 500:500 $INSTALL_ROOT/home/olpc/{Activities,Library}"
+
+print "chown -R 500:500 $INSTALL_ROOT/home/olpc/{Activities,Library}"
 
diff --git a/modules/xo1/kspost.50.xo1-tweaks.inc b/modules/xo1/kspost.50.xo1-tweaks.inc
index 93d0749..a60ecb2 100644
--- a/modules/xo1/kspost.50.xo1-tweaks.inc
+++ b/modules/xo1/kspost.50.xo1-tweaks.inc
@@ -10,6 +10,7 @@ echo "%__dbi_cdb create private nommap" > /etc/rpm/macros.rpmdb
 # what's more, olpc.fth really shouldnt specify a root device
 sed -i -e 's:root=mtd0:root=/dev/mtdblock0:g' /boot/olpc.fth
 
-# FIXME: need an OFW release that runs smbios by default
-sed -i -e 's/^olpc-fth-boot-me/setup-smbios olpc-fth-boot-me/' /boot/olpc.fth
+# Temporarily disable pretty boot to aid diagnosis of boot hangs
+# (could be http://dev.laptop.org/ticket/9100 )
+sed -i -e 's: boot$: visible unfreeze boot:g' /boot/olpc.fth
 
diff --git a/modules/xo1_5/kspkglist.50.xo1_5.inc b/modules/xo1_5/kspkglist.50.xo1_5.inc
index 8771dfc..8c93079 100644
--- a/modules/xo1_5/kspkglist.50.xo1_5.inc
+++ b/modules/xo1_5/kspkglist.50.xo1_5.inc
@@ -1,2 +1,5 @@
 xorg-x11-drv-openchrome
 
+# currently XO-1.5 only
+olpc-runin-tests
+