explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'

              and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
   using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
        to branch 'org.openembedded.dev'

9 files changed, 115 insertions, 35 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index c28e3a7e22..71dc101f0f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -72,7 +72,7 @@ DATETIME = "${DATE}${TIME}"
 
 # python-native should be here but python relies on building 
 # its own in staging
-ASSUME_PROVIDED = "cvs-native svn-native"
+ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-native python-native-runtime perl-native-runtime"
 
 ##################################################################
 # Package default variables.
@@ -304,6 +304,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
 FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
+FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
 GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
 
 # You can use the mirror of your country to get faster downloads by putting
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index cb4ba04876..4bb27afa51 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -10,12 +10,31 @@ DISTRO_TYPE = "debug"
 
 
 FEED_URIS += " \
-        base##http:///${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
-		${MACHINE}##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
-        updates##http://${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
+        base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \
+	${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \
+        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates"
 
 #CVSDATE = 20050331
 
+
+# Opie
+include conf/distro/preferred-opie-versions.inc
+
+# GPE
+include conf/distro/preferred-gpe-versions-2.8.inc
+
+# E
+include conf/distro/preferred-e-versions.inc
+
+PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
+PREFERRED_VERSION_qte = "2.3.10"
+
+
+PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
+PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
+#PREFERRED_PROVIDER_libx11 = "diet-x11"
+
+
 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"
@@ -25,8 +44,11 @@ PREFERRED_PROVIDER_virtual/libintl = "glibc"
 
 #EABI stuff
 #PREFERRED_PROVIDER_virtual/arm-none-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_VERSION_gcc ?= "4.0.2"
+PREFERRED_VERSION_gcc-cross ?= "4.0.2"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.0.2"
+
 
-PREFERRED_PROVIDER_x11=diet-x11
 
 #use EABI toolchain
 #PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214"
@@ -37,29 +59,8 @@ PREFERRED_PROVIDER_x11=diet-x11
 #PREFERRED_VERSION_glibc ?= "2.3.5+cvs20051214"
 #PREFERRED_VERSION_glibc-intermediate ?= "2.3.5+cvs20051214"
 
-#
-# Opie
-#
 
-PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
-PREFERRED_VERSION_qte = "2.3.10"
-
-OPIE_VERSION = "1.2.1"
-include conf/distro/preferred-opie-versions.inc
-
-#
-# GPE
-#
+PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
+PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
 
-PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
-PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus"
-PREFERRED_PROVIDER_x11 = "diet-x11"
-
-include conf/distro/preferred-gpe-versions-2.8.inc
-
-#
-# E
-#
-
-include conf/distro/preferred-e-versions.inc
 
diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index eaf3fb61e7..a68adaae42 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -14,10 +14,21 @@ MAINTAINER ?= "Angstrom Developers <angstrom-dev@handhelds.org>"
 #use ipkg package format with debian style naming
 INHERIT += "package_ipk debian"
 
+#use multimachine buildrules 
+include conf/distro/include/multimachine.conf
+
 #EABI isn't working yet, so we'll use TARGET_OS = linux in the meantime
 #TARGET_OS = "none-linux-gnueabi"
 TARGET_OS = "linux"
 
+#mess with compiler flags to use -Os instead of -O2
+#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+BUILD_OPTIMIZATION = "-Os"
+
+#eabi is softfloat by default, but let's make sure :)
+TARGET_FPU = "soft"
+
 PARALLEL_INSTALL_MODULES = "1"
 
 BOOTSTRAP_EXTRA_DEPENDS += "angstrom-version"
@@ -25,6 +36,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "angstrom-version"
 
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
-
+DEPLOY_DIR_IMAGE = ${DEPLOY_DIR}/images/${MACHINE}
 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index b9ac309a60..f05dd23e81 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -16,6 +16,7 @@ ${PKGDIR}/packages/bluez/*.bb \
 ${PKGDIR}/packages/bogofilter/*.bb \
 ${PKGDIR}/packages/boost/*.bb \
 ${PKGDIR}/packages/bridge-utils/*.bb \
+${PKGDIR}/packages/btsco/*.bb \
 ${PKGDIR}/packages/busybox/*.bb \
 ${PKGDIR}/packages/bwmon/*.bb \
 ${PKGDIR}/packages/bzip2/*.bb \
@@ -198,6 +199,7 @@ ${PKGDIR}/packages/setserial/*.bb \
 ${PKGDIR}/packages/sgml-common/*.bb \
 ${PKGDIR}/packages/slugimage/*.bb \
 ${PKGDIR}/packages/slugos-init/*.bb \
+${PKGDIR}/packages/spca5xx/*.bb \
 ${PKGDIR}/packages/ssmtp/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 3b094d769d..cf2cb078c5 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -170,7 +170,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15.2"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.16-rc4-git9"
 
 # Built-in ethernet modules
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 11445846b2..e130ae09cf 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Unslung Linux Distribution for the NSLU2
 
 DISTRO_NAME = "Unslung"
-DISTRO_VERSION = "6.5-alpha"
+DISTRO_VERSION = "6.7-alpha"
 DISTRO_TYPE = "beta"
 
 FEED_URIS  = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable"
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index f68e3dd36c..1289fb4505 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -18,9 +18,12 @@ BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "57600 ttyAM0"
 
 # used by some images
 ROOT_FLASH_SIZE = "8"
 
 
+#tune for ep93xx cpus
+#can be used for crunch support later on
+#include conf/machine/tune-ep9312.conf
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 0c432ad674..c6f4804d5f 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -4,19 +4,30 @@
 
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
+#use this for a hx47xx ipaq
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+
+#use this for a hx2xxx ipaq
+#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+
 PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
 ROOT_FLASH_SIZE = "80"
 
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
+EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+			  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
+			  -e 256KiB -p"
+
+MODUTILS = "26"	
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
+BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
 BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
 PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
 		  snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
-		  nls_cp437 nls_iso8859-1 nls_utf8"
+		  nls_cp437 nls_iso8859-1 nls_utf8 af_key"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
@@ -29,10 +40,15 @@ GPE_EXTRA_INSTALL += "gaim"
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 include conf/machine/include/tune-xscale.conf
 
-BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
+# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
+#include conf/machine/include/tune-iwmmxt.conf
+
+BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
 HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
                   hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
 
+
+
 module_autoload_hx4700_power = "hx4700_power"
 module_autoload_pcmcia = "pcmcia"
 module_autoload_hx4700_pcmcia = "hx4700_pcmcia"
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
new file mode 100644
index 0000000000..2238f6673e
--- /dev/null
+++ b/conf/machine/qemuarm.conf
@@ -0,0 +1,46 @@
+#@TYPE: Machine
+#@NAME: qemu ARM Emulator setup
+#@DESCRIPTION: Machine configuration for running an ARM system under qemu emulation
+
+KERNEL_VERSION ?= "2.6"
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4 armv5te qemuarm"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_INSTALL += "gaim sylpheed"
+
+include conf/machine/include/handheld-common.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
+pcmciautils apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
+
+# Ethernet modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
+# NFS Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+# Crypto Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+# SMB and CRAMFS
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+# Serial Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs"
+# Bluetooth Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+#                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \
+#                             kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs"
+# Infrared Modules
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm \
+#                             kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+
+IMAGE_FSTYPES = "ext2"
+
+ROOT_FLASH_SIZE = "100"
+# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
+# we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte