Merge remote-tracking branch 'olpc/master' into test-oob

8 files changed, 23 insertions, 3 deletions

diff --git a/examples/f18-xo4.ini b/examples/f18-xo4.ini
index 62fc8f6..09c8f82 100644
--- a/examples/f18-xo4.ini
+++ b/examples/f18-xo4.ini
@@ -26,6 +26,8 @@ add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [osk]
 
+[bluetooth]
+
 [x11]
 
 [gnome]
diff --git a/examples/olpc-os-13.1.0-xo4.ini b/examples/olpc-os-13.1.0-xo4.ini
index 705520c..1fd5c96 100644
--- a/examples/olpc-os-13.1.0-xo4.ini
+++ b/examples/olpc-os-13.1.0-xo4.ini
@@ -26,6 +26,8 @@ add_excludes_to=fedora,fedora-updates,fedora-updates-testing
 
 [osk]
 
+[bluetooth]
+
 [x11]
 
 [gnome]
diff --git a/modules/base/kspkglist.10.core.inc b/modules/base/kspkglist.10.core.inc
index ee25e3c..b1e4df5 100644
--- a/modules/base/kspkglist.10.core.inc
+++ b/modules/base/kspkglist.10.core.inc
@@ -50,6 +50,7 @@ generic-logos
 #isomd5sum
 
 # GSM/CDMA USB modem support, #7172
+ModemManager
 usb_modeswitch
 usb_modeswitch-data
 
diff --git a/modules/base/kspost.50.zip_bootfiles.nochroot.inc b/modules/base/kspost.50.zip_bootfiles.nochroot.inc
index 31cd84b..5c81b0c 100644
--- a/modules/base/kspost.50.zip_bootfiles.nochroot.inc
+++ b/modules/base/kspost.50.zip_bootfiles.nochroot.inc
@@ -39,9 +39,9 @@ remove_original() {
 	rm -f $name
 }
 
-#remove_original vmlinuz
-#remove_original actrd.img
-#remove_original initrd.img
+remove_original vmlinuz
+remove_original actrd.img
+remove_original initrd.img
 
 # symlink actXX to runXX (or the other way) if any of them are missing
 create_missing() {
diff --git a/modules/bluetooth/README b/modules/bluetooth/README
new file mode 100644
index 0000000..1744182
--- /dev/null
+++ b/modules/bluetooth/README
@@ -0,0 +1,5 @@
+This module aims to add bluetooth support to the software build.
+
+At the time of writing, this functionality is limited and only really aimed
+to satisfy production requirements (being able to do a basic bluetooth test
+from the command line) at the XO factory.
diff --git a/modules/bluetooth/kspkglist.50.bluetooth.inc b/modules/bluetooth/kspkglist.50.bluetooth.inc
new file mode 100644
index 0000000..3b355e6
--- /dev/null
+++ b/modules/bluetooth/kspkglist.50.bluetooth.inc
@@ -0,0 +1 @@
+bluez
diff --git a/modules/bluetooth/kspost.50.bluetooth.inc b/modules/bluetooth/kspost.50.bluetooth.inc
new file mode 100644
index 0000000..3d04b6b
--- /dev/null
+++ b/modules/bluetooth/kspost.50.bluetooth.inc
@@ -0,0 +1,3 @@
+# bluetooth service activates itself by default, we don't want that at
+# the moment
+systemctl disable bluetooth.service
diff --git a/modules/xo4/kspost.50.xo4-tweaks.inc b/modules/xo4/kspost.50.xo4-tweaks.inc
index 6d435c9..812481b 100644
--- a/modules/xo4/kspost.50.xo4-tweaks.inc
+++ b/modules/xo4/kspost.50.xo4-tweaks.inc
@@ -6,3 +6,9 @@ ln -sf /lib/systemd/system/serial-getty@.service \
 mkdir -p /etc/systemd/system/runin.target.wants
 ln -sf /lib/systemd/system/serial-getty@.service \
 	/etc/systemd/system/runin.target.wants/serial-getty@ttyS2.service
+
+# FIXME: remove this once #12285 diagnosis is complete
+sed -i -e 's/- 200/- 400/g' /runin/runin-memory
+
+# FIXME: remove this once XO-4 suspend works better
+touch /runin/no-suspend