Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/22 18:22:54+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/22 18:14:34+02:00 void!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into  dominion.dominion.void:/data/build/oe/openembedded

2005/05/22 17:05:21+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/05/22 01:13:55+02:00 uni-frankfurt.de!mickeyl
python-pickle depends on python-codecs

2005/05/21 22:38:37+02:00 uni-frankfurt.de!mickeyl
fix evas-x11 typo

2005/05/21 20:20:50+02:00 uni-frankfurt.de!mickeyl
clean up the imlib2 situation. remove bogus files, split into .inc, -native, -fb, x11

2005/05/21 18:21:42+01:00 rpsys.net!RP
jlime jornada6xx and jornada7xx updates from Kristoffer Ericson

2005/05/21 19:11:16+02:00 uni-frankfurt.de!mickeyl
remove broken e files

2005/05/21 15:47:58+02:00 void!koen
imlib2-x11_1.2.0.004.bb:  fix src_uri, the fetcher choked on the fetch.php?file=bla.tar.bz2. Could the EFL maintainer fix this?

2005/05/21 14:37:02+02:00 uni-frankfurt.de!mickeyl
add opie-pcmciaapplet

2005/05/21 14:35:44+02:00 uni-frankfurt.de!mickeyl
bump openzaurus-3.5.4 CVSDATE

2005/05/21 14:32:25+02:00 uni-frankfurt.de!mickeyl
split ecore into .inc, -fb, -x11 files. remove broken ecore files

2005/05/21 14:25:30+02:00 uni-frankfurt.de!mickeyl
reorganize evas and split into .inc, -fb, and -x11 files

2005/05/21 13:26:17+02:00 uni-frankfurt.de!mickeyl
add udev 058

2005/05/21 12:50:08+02:00 uni-frankfurt.de!mickeyl
task-python-everything: add pytest and pyweather

2005/05/21 12:43:57+02:00 uni-frankfurt.de!mickeyl
add pytest, a reflective unit testing support module
add pyweather, conversion module for weather scientists
upgrade pysqlite to 2.0.2

BKrev: 4290b5f22-A_n5BGjkjPp0-Fb1tzvg

5 files changed, 60 insertions, 1 deletions

diff --git a/conf/distro/jlime.conf b/conf/distro/jlime.conf
index e69de29bb2..599137493c 100644
--- a/conf/distro/jlime.conf
+++ b/conf/distro/jlime.conf
@@ -0,0 +1,48 @@
+#@TYPE : Distribution <SHREK>
+#@NAME : Jornada Linux Mobility Edition (JLime) <www.jlime.com>
+#@DESCRIPTION : Linux for HP jornada 5xx,6xx,7xx,8xx series
+#Created and Maintained by Kristoffer Ericson <Kristoffer@jlime.com>
+
+DISTRO = "Jornada Linux Mobility Edition"
+DISTRO_NAME = "JLime"
+DISTRO_VERSION = "Shrek"
+DISTRO_TYPE = "release"
+
+export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/releases/shrek/${TARGET_ARCH}/feed/"
+
+CVSDATE = 20050518
+
+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"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+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_linuc-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_qte = "4.0.0-snapshot"
+
+INHERIT += "package_tar package_ipk"
+BBINCLUDELOGS = "yes"
+MODUTILS = "26"
+IMAGE_FSTYPES = "tar"
+
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs ncurses nano virtual/kernel wireless-tools console-tools"
+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"
diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
index bc5a4007c8..b4f1f81732 100644
--- a/conf/distro/openzaurus-3.5.4.conf
+++ b/conf/distro/openzaurus-3.5.4.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
 	console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
 	devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
 
-CVSDATE = "20050516"
+CVSDATE = "20050521"
 
 #
 # Zaurus
diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc
index 545f32f992..ff608f28f2 100644
--- a/conf/distro/preferred-opie-versions.inc
+++ b/conf/distro/preferred-opie-versions.inc
@@ -113,6 +113,7 @@ PREFERRED_VERSION_opie-oxygen = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-oyatzee = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-packagemanager = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-parashoot = "${OPIE_VERSION}"
+PREFERRED_VERSION_opie-pcmciaapplet = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-performance = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pickboard = "${OPIE_VERSION}"
 PREFERRED_VERSION_opie-pics = "${OPIE_VERSION}"
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index e69de29bb2..5e81c35430 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: HP Jornada 680
+#@DESCRIPTION: Machine configuration for the HITACHI SH3 based HP Jornada 6xx palmtop computer
+
+TARGET_ARCH = "sh3"
+IPKG_ARCHS = "all sh3 ${MACHINE}"
+PREFERRED_VERSION_glibc = "2.3.4"
+PREFERRED_VERSION_glibc-initial = "2.3.4"
+
+include conf/machine/tune-sh3.conf
diff --git a/conf/machine/jornada720.conf b/conf/machine/jornada7xx.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/machine/jornada720.conf
+++ b/conf/machine/jornada7xx.conf