summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/corecdp.conf43
-rw-r--r--conf/distro/include/fso-autorev.inc1
-rw-r--r--conf/distro/include/kaeilos-2009-preferred-versions.inc37
-rw-r--r--conf/distro/include/preferred-shr-versions.inc9
-rw-r--r--conf/distro/include/sane-srcrevs-fso.inc7
-rw-r--r--conf/distro/include/sane-srcrevs.inc24
-rw-r--r--conf/distro/jlime-2010.1.conf (renamed from conf/distro/jlime-2009.1.conf)21
-rw-r--r--conf/distro/jlime-donkey.conf139
-rw-r--r--conf/distro/jlime-henchman.conf104
-rw-r--r--conf/distro/jlime-mongo.conf105
-rw-r--r--conf/distro/jlime-shrek.conf54
-rw-r--r--conf/distro/kaeilos.conf92
-rw-r--r--conf/distro/minimal.conf8
-rw-r--r--conf/distro/sharprom-compatible.conf1
-rw-r--r--conf/distro/shr.conf2
15 files changed, 136 insertions, 511 deletions
diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf
new file mode 100644
index 0000000000..39ca74a170
--- /dev/null
+++ b/conf/distro/corecdp.conf
@@ -0,0 +1,43 @@
+#@TYPE: Distribution
+#@NAME: CoreCDP <http://www.multitech.net>
+#@DESCRIPTION: CoreCDP Linux Distribution for the MTCDP Cellular Development Platform
+#@MAINTAINER: Multi-Tech Systems <oe-devel@multitech.net>
+
+# Angstrom-based distribution by Multi-Tech Systems, Inc.
+require conf/distro/angstrom-2008.1.conf
+
+# allow use of amend.inc files in FILESPATH to add to existing recipes
+require conf/amend-recipes.inc
+
+DISTRO_NAME = "CoreCDP"
+DISTRO = "corecdp"
+DISTRO_VERSION = "1.1.1"
+DISTRO_TYPE = "release"
+TARGET_VENDOR = "-corecdp"
+BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}"
+
+# Add Multi-Tech mirror for source download as a backup
+INHERIT += "corecdp-mirrors"
+
+IPKG_VARIANT = "opkg-nogpg-nocurl corecdp-version"
+
+# use busybox instead of tinylogin
+IMAGE_LOGIN_MANAGER = "busybox"
+
+DEFAULT_TIMEZONE = "America/Chicago"
+
+# Java versions that work together
+# initial verions
+PREFERRED_VERSION_jamvm-initial ?= "1.4.5"
+PREFERRED_VERSION_classpath-initial ?= "0.93"
+
+# native versions
+PREFERRED_VERSION_jamvm-native ?= "1.5.3"
+PREFERRED_VERSION_classpath-native ?= "0.98"
+
+# target device
+PREFERRED_VERSION_jamvm ?= "1.5.2"
+PREFERRED_VERSION_classpath ?= "0.98"
+
+# don't build bluez4 and the large amount of deps just for libpcap
+PREFERRED_PROVIDER_libpcap = "libpcap-nobluetooth"
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index d719453da8..f5c7974d5b 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -37,6 +37,7 @@ SRCREV_pn-libpersistence = "${AUTOREV}"
SRCREV_pn-mickeydbus = "${AUTOREV}"
SRCREV_pn-mickeyterm = "${AUTOREV}"
SRCREV_pn-misc-vapi = "${AUTOREV}"
+SRCREV_pn-msmcommd = "${AUTOREV}"
SRCREV_pn-python-pytrc = "${AUTOREV}"
SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
SRCREV_pn-vala-native = "${AUTOREV}"
diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 34f0386772..8b120f2eb2 100644
--- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -4,7 +4,7 @@
#@NAME: KaeilOS(R) - http://www.kaeilos.com
#@DESCRIPTION: KaeilOS Linux Distribution preferred version
#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 21-10-2009
+#@VERSION: 11-01-2010
#
# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
# Product website : http://www.KaeilOS.com
@@ -14,7 +14,7 @@ PREFERRED_VERSION_autoconf = "2.63"
PREFERRED_VERSION_autoconf-native = "2.63"
PREFERRED_VERSION_automake-native = "1.10.2"
PREFERRED_VERSION_busybox = "1.13.2"
-PREFERRED_VERSION_cairo = "1.8.0"
+PREFERRED_VERSION_cairo = "1.8.8"
PREFERRED_VERSION_dbus = "1.2.3"
PREFERRED_VERSION_dropbear = "0.51"
PREFERRED_VERSION_fontconfig = "2.6.0"
@@ -23,36 +23,49 @@ PREFERRED_VERSION_glib-2.0-native = "2.22.1"
PREFERRED_VERSION_glibmm = "2.22.1"
PREFERRED_VERSION_glproto = "1.4.9"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_gtk+ = "2.18.0"
+PREFERRED_VERSION_gtk+ = "2.18.3"
PREFERRED_VERSION_gtkmm = "2.18.1"
PREFERRED_VERSION_hal = "0.5.13"
PREFERRED_VERSION_libgemwidget = "1.0"
PREFERRED_VERSION_libgpephone = "0.4"
-PREFERRED_VERSION_libsdl-x11 = "1.2.11"
+PREFERRED_VERSION_libsdl-x11 = "1.2.14"
PREFERRED_VERSION_libtool = "2.2.6a"
PREFERRED_VERSION_libtool-native = "2.2.6a"
PREFERRED_VERSION_libtool-cross = "2.2.6a"
PREFERRED_VERSION_libtool-sdk = "2.2.6a"
-PREFERRED_VERSION_libx11 = "1.2"
-PREFERRED_VERSION_mesa = "7.4"
+PREFERRED_VERSION_mesa = "7.6"
+PREFERRED_VERSION_mesa-dri = "7.6"
+PREFERRED_VERSION_mesa-xlib = "7.6"
+PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165"
PREFERRED_VERSION_pango = "1.24.4"
-PREFERRED_VERSION_pixman = "0.13.2"
+PREFERRED_VERSION_pixman = "0.16.2"
PREFERRED_VERSION_pkgconfig = "0.23"
PREFERRED_VERSION_pkgconfig-native = "0.23"
PREFERRED_VERSION_pulseaudio = "0.9.15"
-PREFERRED_VERSION_python = "2.6.1"
-PREFERRED_VERSION_samba = "3.3.0"
+PREFERRED_VERSION_python = "2.6.2"
+PREFERRED_VERSION_samba = "3.3.9"
PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
+KAEILOS_QT_VERSION ?= "4.6.0"
+PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${KAEILOS_QT_VERSION}"
+
PREFERRED_VERSION_udev = "141"
UDEV_GE_141 = "1"
PREFERRED_VERSION_usbutils = "0.82"
-PREFERRED_VERSION_util-macros-native = "1.2.1"
-PREFERRED_VERSION_util-macros = "1.2.1"
PREFERRED_VERSION_wpa-supplicant = "0.6.9"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_xserver-xorg = "1.6.1"
+
+# Use latest version available
+#PREFERRED_VERSION_util-macros-native = "1.4.1"
+#PREFERRED_VERSION_util-macros = "1.4.1"
+#PREFERRED_VERSION_xserver-xorg = "1.7.3"
+#PREFERRED_VERSION_xf86-video-xgi = "1.5.1"
#
# meta-moblin package SRCREVs
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index c726e5fdf9..39b1f0764e 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -36,6 +36,15 @@ PREFERRED_VERSION_usbutils = "0.82"
PREFERRED_VERSION_wpa-supplicant = "0.6.9"
UDEV_GE_141 = "1"
+ANGSTROM_QT_VERSION ?= "4.6.0"
+PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
+
+
# Downgraded
# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
PREFERRED_VERSION_python-pygtk = "2.10.4"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 726efec3b5..733b15e78b 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -4,16 +4,16 @@
FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28"
SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d"
SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9"
SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2"
SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
@@ -38,6 +38,7 @@ SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-msmcommd ?= "072226ac1e0f21735cb3bc26cdb87cd87e347afb"
SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 34ce856a8e..207c320a66 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -78,7 +78,7 @@ SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-ffalarms ?= "67"
SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-fltk2 ?= "6671"
+SRCREV_pn-fltk2 ?= "6916"
SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr}
SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
@@ -147,11 +147,11 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1089"
SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
-SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
-SRCREV_pn-linux-openmoko-2.6.32 ?= "5e5d518ecad86cc891d91c88d3b144eb30339bca"
-SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
-SRCREV_pn-linux-openmoko-shr-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658"
-SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967"
+SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "5827b20d022fb47ce9c9731d0fb894d361e16ffe"
+SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
+SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
+SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -181,7 +181,7 @@ SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
SRCREV_pn-multitap-pad ?= "373"
SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "2890"
+SRCREV_pn-navit ?= "2902"
SRCREV_pn-navit-icons ?= "2871"
SRCREV_pn-neod ?= "4617"
SRCREV_pn-neomis ?= "6"
@@ -262,7 +262,7 @@ SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6"
SRCREV_pn-phoneuid ?= "215e0b6e021e27cd042d675ec91d501a03211091"
SRCREV_pn-portaudio-v19 ?= "1387"
SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
+SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
SRCREV_pn-pyefl-sudoku ?= "49"
SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
SRCREV_pn-pyphonelog ?= "45783c7fd5ec274421bf87a5cdb372c122370fda"
@@ -280,13 +280,13 @@ SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
SRCREV_pn-qi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
SRCREV_pn-qi-ubi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
-SRCREV_pn-qtwebkit-performance-utilities ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe"
-SRCREV_pn-qtwebkit-performance-utilities-e ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe"
+SRCREV_pn-qtwebkit-performance-utilities ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
+SRCREV_pn-qtwebkit-performance-utilities-e ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
SRCREV_pn-remoko ?= "121"
SRCREV_pn-remoko-server ?= "121"
SRCREV_pn-s3c24xx-gpio ?= "4949"
SRCREV_pn-s3c64xx-gpio ?= "4949"
-SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
+SRCREV_pn-serial-forward ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
SRCREV_pn-settings-daemon ?= "2006"
SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
@@ -334,7 +334,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "44908"
+EFL_SRCREV ?= "45060"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2010.1.conf
index 0d3cc0b908..c60d65ddb8 100644
--- a/conf/distro/jlime-2009.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -1,17 +1,20 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: Jlime 2009.1 <http://jlime.com>
+#@NAME: Jlime 2010.1 <http://www.jlime.com>
#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
# HP Jornada 620/660/680/690/720/728 handheld pc + Nec MP900c,
# Ben Nanonote.
+# Unofficial support for Netbook pro, Bsquare Maui.
#@MAINTAINER: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
+#@MAINTAINER: Alex Ferguson <thoughtmonster@gmail.com>
+#@MAINTAINER: Filip Zyzniewski <filip.zyzniewski@gmail.com>
#-----------------------------------------------------------------------------
#
# Header
#
DISTRO_NAME = "Jlime"
-DISTRO_VERSION = "2009.1"
+DISTRO_VERSION = "2010.1"
DISTRO_TYPE = "release"
export FEED_URLS_jlime = "http://repository.jlime.com/"
@@ -37,6 +40,7 @@ SPLASH = "psplash"
INHERIT += "debian package_tar package_ipk src_distribute_local"
SRC_DIST_LOCAL ?= "symlink"
IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2"
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
#
# Kernel
@@ -98,14 +102,17 @@ require conf/distro/include/sane-srcrevs.inc
#
# Framebuffer & X
#
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_VERSION_mesa = "7.6"
+PREFERRED_VERSION_mesa-dri = "7.6"
+PREFERRED_VERSION_mesa-xlib = "7.6"
#
# General Userspace
#
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
PREFERRED_VERSION_cdparanoia = "10.2"
-require conf/distro/include/preferred-opie-versions-1.2.4.inc \ No newline at end of file
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
deleted file mode 100644
index db964f00bc..0000000000
--- a/conf/distro/jlime-donkey.conf
+++ /dev/null
@@ -1,139 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com>
-#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
-#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
-
-DISTRO_NAME = "jlime"
-DISTRO_VERSION = "donkey"
-
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com"
-
-#<>----------------------------------------------------------------->
-#<> No uniroot
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#<>----------------------------------------------------------------->
-#<> We will set CVS DATE when things are known to work.
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-
-#<>----------------------------------------------------------------->
-#<> We want this so we can crosscompile the kernel using gcc 3.4.3
-#<> Also, select version of modules (and kernel)
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel"
-PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}"
-
-
-#<>----------------------------------------------------------------->
-#<>We want kdrive as our default X-Server.
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
-
-
-#<>----------------------------------------------------------------->
-#<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers
-#<>-----------------------------------------------------------------<
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-PREFERRED_VERSION_binutils-cross-sdk = "2.18"
-PREFERRED_VERSION_gcc = "4.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
-PREFERRED_VERSION_linux-libc-headers = "2.6.23"
-PREFERRED_VERSION_glibc = "2.6.1"
-PREFERRED_VERSION_glibc-initial = "2.6.1"
-
-#<>------------------------------------------------------------------>
-#<>
-#<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
-#<>------------------------------------------------------------------<
-#PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-
-#<>------------------------------------------------------------------>
-#<>
-#<>System-critical software with known working versions.
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.24"
-PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_busybox = "1.9.1"
-
-#<>------------------------------------------------------------------>
-#<>Other Specific stuff.
-#<>
-#<>
-#<>We want to be able to build this for all jornadas so
-#<>to not mess up the folders we need to make them dynamic.
-#<>It will use different folders depending on Arch (set in local.conf)
-#<>------------------------------------------------------------------<
-SRC_DIST_LOCAL = "copy"
-INHERIT += "package_ipk package_tar src_distribute_local"
-BBINCLUDELOGS = "yes"
-IMAGE_FSTYPES = "tar.bz2"
-TARGET_OS = "linux"
-
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra)
-#<>
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests console-tools \
- parted dialog"
-
-
-#<>------------------------------------------------------------------>
-#<>What Qte, libqte.. versions should we use.
-#<>------------------------------------------------------------------<
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions-1.2.3.inc
-
-
-#<>------------------------------------------------------------------>
-#<> We want pcmciautils, not pcmcia-cs
-#<>------------------------------------------------------------------<
-PCMCIA_MANAGER = "pcmciautils"
-
-
-#<>------------------------------------------------------------------>
-#<> We are using gcc 4.1.1 so lets keep optimizations low
-#<>------------------------------------------------------------------<
-FULL_OPTIMIZATION = "-O2"
-
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
-
-
-#<>------------------------------------------------------------------>
-#<>
-#<>
-#<> General non-essential programs with known working versions
-#<>
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_tightvnc = "1.3.9"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
-#PREFERRED_VERSION_encodings = "X11R7.0-1.0.0"
-PREFERRED_VERSION_icewm = "1.2.34"
-PREFERRED_VERSION_xchat = "1.8.11"
-PREFERRED_VERSION_rxvt = "2.6.4"
diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf
deleted file mode 100644
index 14ea57d18c..0000000000
--- a/conf/distro/jlime-henchman.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Jlime Henchman <jlime.com>
-#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
-# NEC Mobile Pro 900/900c handheld pc.
-#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
-#-----------------------------------------------------------------------------
-
-#
-# Header
-#
-DISTRO_NAME = "Jlime"
-DISTRO_VERSION = "Henchman"
-#DISTRO_TYPE = "release"
-#DISTRO_TYPE = "debug"
-
-#export FEED_URLS_jlime = "henchman##http://henchman.jlime.com/feed"
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra)
-#<>
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
- console-tools tslib-tests parted dialog"
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}"
-
-#
-# Naming schemes
-#
-INHERIT += "debian"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.bz2"
-
-#
-# Kernel
-#
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-
-#
-# Binutils & Compiler
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-PREFERRED_VERSION_gcc = "4.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-
-#
-# Target OS & FPU system
-#
-TARGET_OS = "linux"
-TARGET_FPU_arm = "fixed"
-TARGET_FPU_armeb = "fixed"
-
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-
-PREFERRED_VERSION_linux-libc-headers = "2.6.23"
-PREFERRED_VERSION_glibc = "2.5"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf
deleted file mode 100644
index 2e6c43462e..0000000000
--- a/conf/distro/jlime-mongo.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Jlime Mongo <jlime.com>
-#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
-# HP Jornada 720/728 handheld pc.
-#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
-#-----------------------------------------------------------------------------
-
-#
-# Header
-#
-DISTRO_NAME = "Jlime"
-DISTRO_VERSION = "Mongo"
-#DISTRO_TYPE = "release"
-#DISTRO_TYPE = "debug"
-
-export FEED_URLS_jlime = "http://mongo.jlime.com/feed"
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra)
-#<>
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
- console-tools tslib-tests parted dialog"
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}"
-
-#
-# Naming schemes
-#
-INHERIT += "debian"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-INHERIT += "package_tar"
-IMAGE_FSTYPES = "tar.bz2"
-
-#
-# Kernel
-#
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-
-#
-# Binutils & Compiler
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-PREFERRED_VERSION_gcc = "4.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-
-#
-# Target OS & FPU system
-#
-TARGET_OS = "linux"
-TARGET_FPU_arm = "soft"
-TARGET_FPU_armeb = "soft"
-
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-
-PREFERRED_VERSION_linux-libc-headers = "2.6.18"
-PREFERRED_VERSION_glibc = "2.5"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf
deleted file mode 100644
index 98844d76a4..0000000000
--- a/conf/distro/jlime-shrek.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com>
-#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
-#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
-
-DISTRO_NAME = "JLime"
-DISTRO_VERSION = "Shrek"
-DISTRO_TYPE = "release"
-
-export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/Releases/shrek/${TARGET_ARCH}/feed/"
-
-SRCDATE = "20050518"
-
-PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-PREFERRED_PROVIDER_virtual/kernel = "jlime-kernel-${TARGET_ARCH}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-PREFERRED_VERSION_gcc = "3.4.3"
-PREFERRED_VERSION_gcc-cross = "3.4.3"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.3"
-PREFERRED_VERSION_gcc-cross-intermediate = "3.4.3"
-PREFERRED_VERSION_linux-libc-headers = "2.6.7.0"
-PREFERRED_VERSION_glib-2.0-native = "2.6.2"
-PREFERRED_VERSION_glib-2.0 = "2.6.2"
-PREFERRED_VERSION_dpkg = "1.10.23"
-PREFERRED_VERSION_xserver-kdrive = "20050207"
-
-INHERIT += "package_tar package_ipk"
-BBINCLUDELOGS = "yes"
-MODUTILS = "26"
-IMAGE_FSTYPES = "tar.bz2"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \
-kernel-module-3c574-cs kernel-module-3c589-cs kernel-module-8390 \
-kernel-module-airo-cs kernel-module-airo console-tools \
-kernel-module-arlan \
-kernel-module-atmel-cs kernel-module-atmel kernel-module-axnet-cs \
-kernel-module-hermes \
-kernel-module-wavelan kernel-module-wavelan-cs \
-kernel-module-xirc2ps-cs kernel-module-orinoco-cs kernel-module-orinoco \
-kernel-module-nmclan-cs kernel-module-pcnet-cs e2tools e2fsprogs"
-
-TARGET_OS = "linux"
-
-OPIE_VERSION = "1.2.1"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 03595dba1d..ee187ba0c9 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -3,7 +3,7 @@
#@NAME: KaeilOS(R) - http://www.kaeilos.com
#@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 23-10-2009
+#@VERSION: 11-01-2010
#
# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
# Product website : http://www.KaeilOS.com
@@ -59,6 +59,7 @@ CVS_TARBALL_STASH ?= "\
http://www.angstrom-distribution.org/unstable/sources/ \
"
+
#Make sure we use 2.6 on machines with a 2.4/2.6 selector
KERNEL = "kernel26"
MACHINE_KERNEL_VERSION = "2.6"
@@ -72,29 +73,13 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
#KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers = "2.6.23"
+PREFERRED_VERSION_linux-libc-headers = "2.6.31"
# see into glibc-package.bbclass : added KaeilOS hack supporting glibc 2.9
PREFERRED_VERSION_glibc ?= "2.9"
PREFERRED_VERSION_glibc-initial ?= "2.9"
-
-PREFERRED_VERSION_uclibc ?= "0.9.30"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.30"
-
-# Preferred provider for virtual/psplash
-# This enforces a specific brand to be used, in our case the angstrom
-# one. In case you want to change the logo or something like that we
-# suggest you to create another recipe (e.g: psplash-<brand>) for that
-# and add that into your image.
-# You can also opt to change or override this line, but that isn't
-# needed because psplash is using update-alternatives.
-#PREFERRED_PROVIDER_virtual/psplash ?= "psplash-kaeilos"
-
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
-PREFERRED_PROVIDER_virtual/gail ?= "gtk+"
-
-PREFERRED_PROVIDER_libfribidi = "fribidi"
+PREFERRED_VERSION_uclibc ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
#powerpc needs additional patches to gcc
ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
@@ -105,15 +90,20 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
ANGSTROM_GCC_VERSION_bfin = "4.1.2"
# Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
-#KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
+#KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53"
+KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53"
#avr32 only has support for gcc 4.2.2
ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
+#armv4 needs at least gcc 4.4.2 for eabi
+ANGSTROM_GCC_VERSION_armv4 ?= "4.4.2"
+
#Everybody else can just use this:
ANGSTROM_GCC_VERSION ?= "4.3.3"
ANGSTROM_BINUTILS_VERSION ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv4 ?= "2.20"
ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7"
PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}"
@@ -134,71 +124,29 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
# Toolchain virtuals:
require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
-# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
-PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
-PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
-
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-
-# Others:
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_esound ?= "pulseaudio"