unbreak conf/ inclusion caused by kergoth's batch rename

BKrev: 4165b9c01stiHQ1gecbRR9Qr3w_nzQ

14 files changed, 717 insertions, 0 deletions

diff --git a/conf/distro/familiar-0.8.0.conf b/conf/distro/familiar-0.8.0.conf
index e69de29bb2..335dc67233 100644
--- a/conf/distro/familiar-0.8.0.conf
+++ b/conf/distro/familiar-0.8.0.conf
@@ -0,0 +1,211 @@
+include conf/distro/familiar.conf
+DISTRO = "familiar"
+
+CVSDATE = 20040915
+ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
+PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+OEINCLUDELOGS = "yes"
+KERNEL_CONSOLE = "tty1"
+TARGET_FPU = "soft"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
+PREFERRED_VERSION_binutils-cross = "2.15.91.0.1"
+PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
+PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
+
+#
+# Opie
+#
+
+OPIE_VERSION = "1.1.6"
+PREFERRED_VERSION_libopie = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopieobex = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopietooth = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-camera = "1.0.1"
+PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-checkbook = "0.8.0"
+PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oxygen = "1.0.0"
+PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qashmoney = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qcop = "1.0.0"
+PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ubrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wellenreiter = "1.0.3"
+PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+
diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
index e69de29bb2..e73349a64b 100644
--- a/conf/distro/openzaurus-3.5.1.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
@@ -0,0 +1,287 @@
+include conf/distro/openzaurus.conf
+DISTRO = "openzaurus"
+
+CVSDATE = 20040915
+ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
+PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-x11"
+PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
+
+OEINCLUDELOGS = "yes"
+KERNEL_CONSOLE = "tty1"
+TARGET_FPU = "soft"
+#DEBUG_OPTIMIZATION = "-O -g3"
+#DEBUG_BUILD = "1"
+#INHIBIT_PACKAGE_STRIP = "1"
+
+PREFERRED_VERSION_binutils-cross = "2.15.91.0.1"
+PREFERRED_VERSION_qte-for-opie = "2.3.7"
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+PREFERRED_VERSION_glibc = "2.3.2+cvs20040726"
+PREFERRED_VERSION_libpng = "1.2.5+1.2.6rc5"
+
+#
+# Opie
+#
+
+OPIE_VERSION = "1.1.6"
+PREFERRED_VERSION_libopie = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopieobex = "${OPIE_VERSION}"
+PREFERRED_VERSION_libopietooth = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}"
+PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-alarm = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-appearance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-aqpkg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-autorotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backgammon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-backup = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bartender = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-batteryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluepin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bluetoothmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-bounce = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-button-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-buzzword = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calculator = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-calibrate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-camera = "1.0.1"
+PREFERRED_VERSION_opie-cardmon = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-checkbook = "0.8.0"
+PREFERRED_VERSION_opie-citytime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clipboardapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clockapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-clock = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-confeditor = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-console = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dagger = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dasher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-datebook = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-deco-polished = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-doctab = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-drawpad = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-dvorak = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-embeddedkonsole = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-euroconv = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-examples-python = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-eye = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-fifteen = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-formatter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-freetype = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftplib = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ftp = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-go = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-gutenbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-handwriting = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-helpbrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-help-en = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-homeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-i18n = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irc = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-irdaapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-jumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kbill = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kcheckers = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keypebble = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keytabs = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-keyview = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kjumpx = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-kpacman = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-language = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-launcher-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-libqrsync = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-light-and-power = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-login = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-logoutapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mailapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mail = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmadplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libmodplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libtremorplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1-libwavplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer1 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediaplayer2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mediummount = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-memoryapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mindbreaker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-minesweep = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-mobilemsg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikeyapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-multikey = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networkapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-networksettings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-notesapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-odict = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-osearch = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-oxygen = "1.0.0"
+PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pimconverter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-powerchord = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pyquicklaunchapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qashmoney = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qasteroids = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-qcop = "1.0.0"
+PREFERRED_VERSION_opie-quicklauncher = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rdesktop = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-reader = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-recorder = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-remote = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet2 = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-restartapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-rotateapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-screenshotapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-search = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-security = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-securityplugins = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sfcave = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sheet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-showimg = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-snake = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-solitaire = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sshkeys = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-flat = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-fresh = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-liquid = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-metal = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-phase = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-style-web = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-suspendapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-symlinker = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-sysinfo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-systemtime = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tableviewer = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tabmanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-taskbar = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tetrix = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-textedit = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-theme = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tictac = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tinykate = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-addressbookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-datebookplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-fortuneplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-mailplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-stocktickerplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-todolistplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-today-weatherplugin = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-todo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-tonleiter = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-ubrowser = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-unikeyboard = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-usermanager = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vmemo-settings = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-volumeapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-vtapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wellenreiter = "1.0.3"
+PREFERRED_VERSION_opie-wirelessapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-wordgame = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-write = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}"
+
+#
+# GPE
+#
+
+PREFERRED_VERSION_libmatchbox = "1.2"
+PREFERRED_VERSION_matchbox = "0.8.1"
+PREFERRED_VERSION_matchbox-common = "0.8"
+PREFERRED_VERSION_matchbox-desktop = "0.8.1"
+PREFERRED_VERSION_matchbox-wm = "0.8.2"
+PREFERRED_VERSION_matchbox-panel = "0.8.1"
+PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
+PREFERRED_VERSION_gtk+ = "2.4.4"
+PREFERRED_VERSION_libgpewidget = "0.90"
+PREFERRED_VERSION_libgpepimc = "0.3"
+PREFERRED_VERSION_libgpevtype = "0.4"
+PREFERRED_VERSION_libschedule = "0.13"
+PREFERRED_VERSION_gpe-icons = "0.22"
+PREFERRED_VERSION_libgsm = "1.0.10"
+PREFERRED_VERSION_diet-x11 = "6.2.1"
+PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
+PREFERRED_VERSION_rxvt-unicode = "3.7"
+PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
+PREFERRED_VERSION_xst = "0.14"
+PREFERRED_VERSION_xprop = "0.0cvs${CVSDATE}" 
+PREFERRED_VERSION_xhost = "0.0cvs20040413"
+PREFERRED_VERSION_xrdb = "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_gpe-login = "0.73"
+PREFERRED_VERSION_gpe-session-scripts = "0.61"
+PREFERRED_VERSION_gpe-soundserver = "0.4-1"
+PREFERRED_VERSION_gpe-todo = "0.48"
+PREFERRED_VERSION_gpe-calendar = "0.56"
+PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
+PREFERRED_VERSION_gpe-contacts = "0.29"
+PREFERRED_VERSION_gpe-today = "0.08"
+PREFERRED_VERSION_matchbox-panel-manager = "0.1"
+PREFERRED_VERSION_dbus = "0.21"
+PREFERRED_VERSION_gpe-bluetooth = "0.36.3"
+PREFERRED_VERSION_gpe-su = "0.18"
+PREFERRED_VERSION_gpe-conf = "0.1.19"
+PREFERRED_VERSION_gpe-clock = "0.14"
+PREFERRED_VERSION_gpe-mininet = "0.4"
+PREFERRED_VERSION_gpe-mixer = "0.38"
+PREFERRED_VERSION_gpe-shield = "0.6"
+PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
+PREFERRED_VERSION_gpe-taskmanager = "0.17"
+PREFERRED_VERSION_keylaunch = "2.0.7"
+PREFERRED_VERSION_minilite = "0.44"
+PREFERRED_VERSION_xmonobut = "0.4"
+PREFERRED_VERSION_gpe-edit = "0.28"
+PREFERRED_VERSION_gpe-gallery = "0.95"
+PREFERRED_VERSION_gpe-calculator = "0.2"
+PREFERRED_VERSION_gpe-package = "0.0.12"
+PREFERRED_VERSION_gpe-soundbite = "1.0.5"
+PREFERRED_VERSION_gpe-terminal = "1.1"
+PREFERRED_VERSION_gpe-watch = "0.10"
+PREFERRED_VERSION_gpe-what = "0.31"
+PREFERRED_VERSION_gpe-filemanager = "0.20"
+PREFERRED_VERSION_gpe-go = "0.05"
+PREFERRED_VERSION_gpe-irc = "0.07"
+PREFERRED_VERSION_gpe-lights = "0.12"
+PREFERRED_VERSION_gpe-nmf = "0.19"
+PREFERRED_VERSION_gpe-othello = "0.2-1"
+PREFERRED_VERSION_gpe-plucker = "0.1"
+PREFERRED_VERSION_gpe-session-scripts = "0.61"
+PREFERRED_VERSION_gpe-tetris = "0.6-2"
+PREFERRED_VERSION_gsoko = "0.4.2-gpe5"
+PREFERRED_VERSION_xdemineur = "2.1.1"
+PREFERRED_VERSION_matchbox-panel-hacks = "0.3-1"
+PREFERRED_VERSION_rosetta = "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_dillo2 = "0.6.6"
+PREFERRED_VERSION_minimo = "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_linphone-hh = "0.12.2.hh1"
+PREFERRED_VERSION_linphone = "0.12.2"
+PREFERRED_VERSION_firefox = "0.9.3"
+
diff --git a/conf/machine/beagle.conf b/conf/machine/beagle.conf
index e69de29bb2..edb07fa1b4 100644
--- a/conf/machine/beagle.conf
+++ b/conf/machine/beagle.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: MasterIA PA100
+#@DESCRIPTION: Machine configuration for the SA1100 based MasterIA PA-100 device
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "montavista-sa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils hostap-modules orinoco-modules "
+BOOTSTRAP_EXTRA_RDEPENDS = " kernel-module-net-fd \
+kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor \
+kernel-module-pcnet-cs kernel-module-8390 kernel-module-unix  \
+kernel-module-sa1100-ir \
+kernel-module-usb-eth kernel-module-sa1100usb-core \
+kernel-module-ppp-generic kernel-module-ppp-async kernel-module-mtdchar \
+kernel-module-fat kernel-module-vfat "
+BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs "
+
+
+# FIXME: the modules list is not complete yet!
+
+EXTRA_IMAGECMD_jffs2 = "--pad=0xec0000 --little-endian --eraseblock=0x40000"
+EXTRA_IMAGEDEPENDS = "cetools-native"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   ${EXTRA_IMAGECMD}; bin2rom ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
+                   ffffffff ffffffff d0140000"
+
+include conf/machine/handheld-common.conf
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttySA0"
+
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index e69de29bb2..b693f1329a 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
+#@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor " 
+
+# This is needed for the ramdisk script to work
+BOOTSTRAP_EXTRA_DEPENDS  += "e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+include conf/machine/handheld-common.conf
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
diff --git a/conf/machine/corgi.conf b/conf/machine/corgi.conf
index e69de29bb2..080ad1af7b 100644
--- a/conf/machine/corgi.conf
+++ b/conf/machine/corgi.conf
@@ -0,0 +1,5 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C700
+#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-C700 device
+
+include conf/machine/zaurus-pxa.conf
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index e69de29bb2..907437c857 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
+#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ipaqpxa h3900"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
+EXTRA_IMAGECMD_h3900 = "-e 0x40000 -p"
+BOOTSTRAP_EXTRA_DEPENDS = "handhelds-pxa at76c503a-modules"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3900_MODULES}')} at76c503a-modules"
+H3900_MODULES = "h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio"
+
+SERIAL_CONSOLE = "115200 tts/0 vt100"
+USE_DEVFS = "1"
+
+include conf/machine/ipaq-common.conf
+include conf/machine/handheld-common.conf
+
+GPE_MACHINE_CLASS = "smallscreen"
+
+# not using tune-xscale so as to retain backwards compatibility
+include conf/machine/tune-strongarm.conf
diff --git a/conf/machine/husky.conf b/conf/machine/husky.conf
index e69de29bb2..24a7f61dff 100644
--- a/conf/machine/husky.conf
+++ b/conf/machine/husky.conf
@@ -0,0 +1,5 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C750,Sharp Zaurus SL-C760
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C760 and Sharp Zaurus SL-C860 devices
+
+include conf/machine/zaurus-pxa.conf
diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf
index e69de29bb2..f7335a624c 100644
--- a/conf/machine/ipaq-pxa-2.6.conf
+++ b/conf/machine/ipaq-pxa-2.6.conf
@@ -0,0 +1,7 @@
+IPKG_ARCHS = "all arm ipaqpxa ${MACHINE}"
+TARGET_ARCH = arm
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules modutils-collateral"
+include conf/machine/handheld-common.conf
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index e69de29bb2..04a1c74665 100644
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: OMAP1610 cpu on an H2 board
+#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral"
+BOOTSTRAP_EXTRA_RDEPENDS = "modutils-collateral"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+include conf/machine/tune-arm926ejs.conf
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index e69de29bb2..d59ffea18d 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
+#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+kernel-module-ip-gre  \
+kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+
+include conf/machine/handheld-common.conf
+# not using tune-xscale.conf so as to retain backwards compatibility
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
diff --git a/conf/machine/ramses.conf b/conf/machine/ramses.conf
index e69de29bb2..7c47c2bd97 100644
--- a/conf/machine/ramses.conf
+++ b/conf/machine/ramses.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: M&N MNCI-RX
+#@DESCRIPTION: Machine configuration for the PXA255 based M&N Solutions MNCI-RX
+
+include conf/machine/openmnci.conf
+include conf/machine/tune-xscale.conf
+
+TARGET_ARCH = "arm"
+TARGET_OS = "linux"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "mnci-ramses"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
+
+
+USE_DEVFS = "1"
+GPE_MACHINE_CLASS = "smallscreen"
+
+# For sysvinit:
+USE_VT = "0"
+SERIAL_CONSOLE = "115200 tts/0"
diff --git a/conf/machine/shepherd.conf b/conf/machine/shepherd.conf
index e69de29bb2..91987fc4f7 100644
--- a/conf/machine/shepherd.conf
+++ b/conf/machine/shepherd.conf
@@ -0,0 +1,5 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C750
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C750 device
+
+include conf/machine/zaurus-pxa.conf
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index e69de29bb2..5dd25503d4 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-6000
+#@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
+BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm kernel-module-evdev kernel-module-net-fd \
+kernel-module-pxa-bi kernel-module-registers kernel-module-storage-fd kernel-module-usb-ohci-tc6393 kernel-module-usb-storage \
+kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support kernel-module-pxa-bi modutils chkhinge kernel-module-ip-gre \
+kernel-module-irnet kernel-module-ipip modutils-collateral kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor"
+
+RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd kernel-module-usbmouse kernel-module-hid usbutils kernel-module-evdev"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
+
+# GPE_MACHINE_CLASS = "bigscreen"
+# GPE_EXTRA_DEPENDS = "gaim"
+
+include conf/machine/handheld-common.conf
+# not using tune-xscale.conf so as to retain backwards compatibility
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/zaurus-pxa.conf b/conf/machine/zaurus-pxa.conf
index e69de29bb2..f92a60be19 100644
--- a/conf/machine/zaurus-pxa.conf
+++ b/conf/machine/zaurus-pxa.conf
@@ -0,0 +1,27 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor modutils chkhinge"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
+EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+		   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
+		   ${EXTRA_IMAGECMD}; \
+		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > \
+	           ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
+
+GPE_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS = "gaim"
+
+include conf/machine/handheld-common.conf
+# not using tune-xscale.conf so as to retain backwards compatibility
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"