Merge branch 'master' of dev.laptop.org:/git/projects/olpc-os-builder

6 files changed, 36 insertions, 5 deletions

diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc
index d7cf96b..bb0fc41 100644
--- a/modules/base/kspost.10.core.inc
+++ b/modules/base/kspost.10.core.inc
@@ -157,6 +157,12 @@ rm -f /etc/avahi/etc/localtime
 /usr/sbin/prelink --all --conserve-memory --random
 chmod -x /etc/cron.daily/prelink
 
+# kill a load of non-interesting anacron tasks (#10247)
+chmod -x /etc/cron.daily/{logrotate,rpm,tmpwatch}
+chmod -x /etc/cron.daily/{makewhatis,mlocate,readahead}.cron
+chmod -x /etc/cron.weekly/99-raid-check
+chmod -x /etc/cron.monthly/readahead-monthly.cron
+
 # suppress generation of certain SSH host keys in the same way we did
 # it on XO-1 builds, so as to reduce first boot time by several
 # seconds (#9964)
diff --git a/modules/base/kspost.10.version_number.sh b/modules/base/kspost.10.version_number.sh
index 9190eab..8692b62 100644
--- a/modules/base/kspost.10.version_number.sh
+++ b/modules/base/kspost.10.version_number.sh
@@ -28,7 +28,7 @@ echo "OLPC release $majver (based on Fedora $fver)" > /etc/fedora-release
 # this is used by the activity updater
 echo "$majver.$minver.$relver" > /etc/olpc-release
 
-sed -i -e "1s/.*/OLPC OS $majver.$minver for ${platform}${custstr} (build $buildnr)/" /etc/issue
+sed -i -e "1s/.*/OLPC OS $majver.$minver.$relver for ${platform}${custstr} (build $buildnr)/" /etc/issue
 cp /etc/issue /etc/issue.net
 
 echo "${buildnr}${custbstr}" > /boot/olpc_build
diff --git a/modules/sugar/kspkglist.50.sugar.inc b/modules/sugar/kspkglist.50.sugar.inc
index 41a5f1e..a15e112 100644
--- a/modules/sugar/kspkglist.50.sugar.inc
+++ b/modules/sugar/kspkglist.50.sugar.inc
@@ -16,6 +16,7 @@ numpy
 csound
 csound-python
 pygame
+python-alsaaudio
 python-json
 squeak-vm
 # Browse
diff --git a/modules/usb_update/README b/modules/usb_update/README
new file mode 100644
index 0000000..ef70133
--- /dev/null
+++ b/modules/usb_update/README
@@ -0,0 +1,10 @@
+This module creates produces an output file named osXX.usb. This file can
+be used with the command "olpc-update --usb" to update the software on a
+laptop.
+
+This module requires the versioned_fs option in the base module to be enabled.
+(the update system revolves around the fact that a versioned fs is used)
+
+The .usb file is actually an ISO image in disguise. In the future, we should
+enable squashfs in the XO kernel and distribute a squashfs image instead.
+
diff --git a/modules/usb_update/image.60.makeusb.sh b/modules/usb_update/image.60.makeusb.sh
new file mode 100644
index 0000000..03e3907
--- /dev/null
+++ b/modules/usb_update/image.60.makeusb.sh
@@ -0,0 +1,18 @@
+# Copyright (C) 2010 One Laptop Per Child
+# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
+
+. $OOB__shlib
+majver=$(read_config global olpc_version_major)
+minver=$(read_config global olpc_version_minor)
+relver=$(read_config global olpc_version_release)
+versioned_fs=$(read_config base versioned_fs)
+buildnr=$(read_buildnr)
+
+if [ "$versioned_fs" != "1" ]; then
+	echo "ERROR: usb_upgrade requires base.versioned_fs=1" >&2
+	exit 1
+fi
+
+echo "Making USB olpc-update image..."
+mkisofs -o $outputdir/os$buildnr.usb -quiet -cache-inodes -iso-level 4 -publisher "olpc-os-builder" -R -V "$majver.$minver.$relver $buildnr" $fsmount/versions/pristine/*
+
diff --git a/modules/xo1/kspost.50.xo1-tweaks.inc b/modules/xo1/kspost.50.xo1-tweaks.inc
index a60ecb2..a5d2aa2 100644
--- a/modules/xo1/kspost.50.xo1-tweaks.inc
+++ b/modules/xo1/kspost.50.xo1-tweaks.inc
@@ -10,7 +10,3 @@ 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
 
-# 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
-