From b0a020f1ae8f32f15f2e134a3d3c6938b92a86f9 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Wed, 26 Sep 2012 17:53:36 +0000
Subject: Add XO-4 support

---
diff --git a/examples/f18-xo4.ini b/examples/f18-xo4.ini
new file mode 100644
index 0000000..05f9c43
--- /dev/null
+++ b/examples/f18-xo4.ini
@@ -0,0 +1,121 @@
+[global]
+fedora_release=18
+olpc_version_major=13
+olpc_version_minor=1
+olpc_version_release=0
+target_platform=XO-1.4
+langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN,de,hy
+
+[base]
+
+[xo4]
+
+[sd_card_image]
+
+[repos]
+fedora_arch=armhfp
+fedora=fedora,fedora-updates-testing
+olpc_publicrpms_1=1,f18
+olpc_publicrpms_2=1,f18-xo4
+add_excludes_to=fedora,fedora-updates-testing
+
+[yumcfg]
+addrepo_1=1,olpc-f18,http://rpmdropbox.laptop.org/f18/
+addrepo_2=1,olpc-f18-xo4,http://rpmdropbox.laptop.org/f18-xo4/
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+
+[x11]
+
+[gnome]
+
+[sugar]
+favorites_view_add=
+	org.sugarlabs.InfoSlicer,
+	org.sugarlabs.IRC,
+	org.laptop.physics,
+	org.laptop.Words,
+	org.laptop.community.TypingTurtle,
+	org.gnome.Labyrinth,
+	org.laptop.sugar.GetBooksActivity,
+	org.laptop.WikipediaActivity,
+	org.laptop.WikipediaActivityEN,
+	org.laptop.StopWatchActivity,
+	org.laptop.RecordActivity,
+	org.laptop.community.Finance,
+	tv.alterna.Clock,
+	org.eq.FotoToon,
+	org.sugarlabs.AbacusActivity,
+	org.sugarlabs.PortfolioActivity,
+	org.sugarlabs.SimpleGraph
+favorites_view_del=
+	org.laptop.sugar.ReadActivity,
+	org.laptop.TamTamSynthLab
+protected_activities=
+	org.laptop.WebActivity,
+	org.laptop.Terminal,
+	org.laptop.Log,
+	org.laptop.AbiWordActivity,
+	org.laptop.sugar.ReadActivity,
+	org.laptop.ImageViewerActivity,
+	org.laptop.RecordActivity
+
+[sugarlabs_activities]
+experimental=1
+activities=org.laptop.HelpActivity,
+	org.laptop.AbiWordActivity,
+	org.laptop.Oficina,
+	org.laptop.TamTamSynthLab,
+	org.laptop.TamTamJam,
+	org.laptop.TamTamEdit,
+	org.laptop.TamTamMini,
+	org.laptop.Chat,
+	org.laptop.Pippy,
+	org.laptop.TurtleArtActivity,
+	org.laptop.Calculate,
+	org.laptop.Memorize,
+	com.jotaro.ImplodeActivity,
+	vu.lux.olpc.Speak,
+	org.laptop.physics,
+	org.laptop.sugar.Jukebox,
+	org.gnome.Labyrinth,
+	org.laptop.ImageViewerActivity,
+	org.laptop.community.Finance,
+	org.laptop.AcousticMeasure,
+	org.laptop.WebActivity,
+	org.vpri.EtoysActivity,
+	org.laptop.MeasureActivity,
+	vu.lux.olpc.Maze,
+	com.garycmartin.Moon,
+	org.laptop.Terminal,
+	org.laptop.Log,
+	org.laptop.community.TypingTurtle,
+	org.sugarlabs.InfoSlicer,
+	org.laptop.StopWatchActivity,
+	org.laptop.sugar.GetBooksActivity,
+	org.laptop.sugar.ReadActivity,
+	org.laptop.RecordActivity,
+	org.laptop.WikipediaActivity,
+	org.laptop.WikipediaActivityEN,
+	org.sugarlabs.AbacusActivity,
+	org.eq.FotoToon,
+	tv.alterna.Clock,
+	com.laptop.Ruler,
+	org.sugarlabs.HelloWorld,
+	org.laptop.Words,
+	org.sugarlabs.PortfolioActivity,
+	org.sugarlabs.SimpleGraph
+
+[sugar_activities_extra]
+url_1=http://wiki.laptop.org/images/8/86/Scratch-23.xo
+url_6=http://dev.laptop.org/~gonzalo/Biology-10.xol
+url_7=http://wiki.laptop.org/images/7/77/Wikibooks-8.xol
+url_8=http://wiki.laptop.org/images/5/5e/NatureImages-8.xol
+url_9=http://wiki.laptop.org/images/9/9e/JamendoMusic-5.xol
+url_10=http://wiki.laptop.org/images/0/05/TranslationDictionary-8.xol
+url_11=http://wiki.laptop.org/images/3/34/ICDL-8.xol
+url_12=http://wiki.laptop.org/images/a/af/WorldFactbookMaps-6.xol
+url_13=http://wiki.laptop.org/images/f/fe/WikisliceChemistry-en-8.xol
+url_14=http://dev.laptop.org/~sj/WorldDigitalLibrary-5.xol
+
+[buildnr_from_file]
+path=latestbuild
diff --git a/modules/xo4/README b/modules/xo4/README
new file mode 100644
index 0000000..cccafa6
--- /dev/null
+++ b/modules/xo4/README
@@ -0,0 +1,3 @@
+This module applies various build tweaks required for the XO-4 platform.
+If you are building for XO-4, include this module. Do not include it
+otherwise.
diff --git a/modules/xo4/kspkglist.50.xo4.inc b/modules/xo4/kspkglist.50.xo4.inc
new file mode 100644
index 0000000..200d837
--- /dev/null
+++ b/modules/xo4/kspkglist.50.xo4.inc
@@ -0,0 +1,5 @@
+olpc-firmware-q7
+libertas-sd8686-firmware
+libertas-sd8787-firmware
+xorg-x11-drv-dove
+olpc-runin-tests
diff --git a/modules/xo4/kspost.50.xo4-tweaks.inc b/modules/xo4/kspost.50.xo4-tweaks.inc
new file mode 100644
index 0000000..6d435c9
--- /dev/null
+++ b/modules/xo4/kspost.50.xo4-tweaks.inc
@@ -0,0 +1,8 @@
+# enable serial console on ttyS2
+ln -sf /lib/systemd/system/serial-getty@.service \
+	/etc/systemd/system/getty.target.wants/serial-getty@ttyS2.service
+
+# enable serial console for runin too
+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
diff --git a/modules/xo4/prepare.10.model.sh b/modules/xo4/prepare.10.model.sh
new file mode 100644
index 0000000..a96a3ef
--- /dev/null
+++ b/modules/xo4/prepare.10.model.sh
@@ -0,0 +1,5 @@
+# Copyright (C) 2012 One Laptop Per Child
+# Licensed under the terms of the GNU GPL v2 or later; see COPYING for details.
+
+. $OOB__shlib
+echo 4 > $intermediatesdir/laptop_model_number
--
cgit v0.9.1