merge of '7f7e2abbafbc78c693195ccd3ecbc44742312157'

     and 'a3a33729f3f0c0ad0c71c9872010fc1d7dd4f9ee'

76 files changed, 1994 insertions, 4176 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 22d6bd59f2..1842441ff5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -218,7 +218,7 @@ Recipes:    vsftpd, zd1211
 Person:     Henning Heinold 'woglinde'
 Mail:       heinold@inf.fu-berlin.de
 Machines:   simpad
-Recipes:    classpath-minimal, midpath, cacao-clcd
+Recipes:    classpath-minimal, midpath, cacao-cldc
 
 Person:     Philipp Zabel
 Mail:       philipp.zabel@gmail.com
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index d0e732bcc9..6d5d84a794 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -220,8 +220,6 @@ PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh12"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
-PREFERRED_VERSION_linux_at91sam9263ek               ?= "2.6.20"
-
 # Needed for crappy ipaqs with broken hostap in the kernel
 PREFERRED_VERSION_hostap-modules                    ?= "0.4.7"
 PREFERRED_VERSION_hostap-utils                      ?= "0.4.7"
@@ -249,6 +247,8 @@ PREFERRED_VERSION_osb-jscore       = "0.5.2+svn${SRCDATE}"
 PREFERRED_VERSION_osb-nrcit        = "0.5.2+svn${SRCDATE}"
 PREFERRED_VERSION_osb-nrcore       = "0.5.2+svn${SRCDATE}"
 
+PREFERRED_PROVIDER_avahi = "avahi"
+
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc
new file mode 100644
index 0000000000..c7a460d7d1
--- /dev/null
+++ b/conf/distro/include/angstrom-package-deb.inc
@@ -0,0 +1 @@
+INHERIT += "package_deb"
diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc
new file mode 100644
index 0000000000..b3f4ff64d6
--- /dev/null
+++ b/conf/distro/include/angstrom-package-ipk.inc
@@ -0,0 +1 @@
+INHERIT += "package_ipk"
diff --git a/conf/distro/include/angstrom-package-rpm.inc b/conf/distro/include/angstrom-package-rpm.inc
new file mode 100644
index 0000000000..86bef129d0
--- /dev/null
+++ b/conf/distro/include/angstrom-package-rpm.inc
@@ -0,0 +1 @@
+INHERIT += "package_rpm"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index e3e77f9f18..7d364a5ee0 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -19,9 +19,12 @@ ANGSTROM_URI = "http://www.angstrom-distribution.org"
 #Set the default maintainer to angstrom-dev
 MAINTAINER = "Angstrom Developers <angstrom-distro-devel@linuxtogo.org>"
 
-#use ipkg package format with debian style naming
+#use debian style naming
 #use multimachine buildrules 
-INHERIT += "package_ipk debian multimachine sanity devshell angstrom-mirrors insane"
+INHERIT += "debian multimachine sanity devshell angstrom-mirrors insane"
+
+ANGSTROM_PKG_FORMAT ?= "ipk"
+require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
@@ -39,6 +42,167 @@ TARGET_FPU_arm ?= "soft"
 TARGET_FPU_armeb ?= "soft"
 TARGET_FPU_ixp4xx ?= "soft"
 
+#Set the right arch for the feeds
+#Alphabetically sorted
+
+FEED_ARCH ?= "${TARGET_ARCH}"
+
+#blackfin machines
+FEED_ARCH_bfin          = "blackfin"
+
+#armv4t machines
+
+FEED_ARCH_acern30 	= "armv4t"
+FEED_ARCH_amsdelta 	= "armv4t"
+FEED_ARCH_ep93xx 	= "armv4t"
+FEED_ARCH_eteng500 	= "armv4t"
+FEED_ARCH_fic-gta01 	= "armv4t"
+FEED_ARCH_fic-gta02 	= "armv4t"
+FEED_ARCH_h1940 	= "armv4t"
+FEED_ARCH_h6300 	= "armv4t"
+FEED_ARCH_kb9202 	= "armv4t"
+FEED_ARCH_ks8695 	= "armv4t"
+FEED_ARCH_rx1950 	= "armv4t"
+FEED_ARCH_rx3000 	= "armv4t"
+FEED_ARCH_sarge-at91 	= "armv4t"
+FEED_ARCH_smdk2440 	= "armv4t"
+FEED_ARCH_smdk2443 	= "armv4t"
+
+#armv5t machines
+
+FEED_ARCH_a1200 	= "armv5te"
+FEED_ARCH_a780 		= "armv5te"
+FEED_ARCH_akita 	= "armv5te"
+FEED_ARCH_asus620 	= "armv5te"
+FEED_ARCH_asus730 	= "armv5te"
+FEED_ARCH_at91sam9263ek = "armv5te"
+FEED_ARCH_aximx50 	= "armv5te"
+FEED_ARCH_aximx50v 	= "armv5te"
+FEED_ARCH_c7x0 		= "armv5te"
+FEED_ARCH_compulab-pxa270 = "armv5te"
+FEED_ARCH_davinci-dvevm = "armv5te"
+FEED_ARCH_devkitidp-pxa255 = "armv5te"
+FEED_ARCH_e680 		= "armv5te"
+FEED_ARCH_er0100 	= "armv5te"
+FEED_ARCH_gumstix 	= "armv5te"
+FEED_ARCH_gumstix-verdex = "armv5te"
+FEED_ARCH_gumstix-connex = "armv5te"
+FEED_ARCH_h1910 	= "armv5te"
+FEED_ARCH_h2200 	= "armv5te"
+FEED_ARCH_h3900 	= "armv5te"
+FEED_ARCH_h4000 	= "armv5te"
+FEED_ARCH_h5000 	= "armv5te"
+FEED_ARCH_htcalpine 	= "armv5te"
+FEED_ARCH_htcapache 	= "armv5te"
+FEED_ARCH_htcblueangel 	= "armv5te"
+FEED_ARCH_htchimalaya 	= "armv5te"
+FEED_ARCH_htcsable 	= "armv5te"
+FEED_ARCH_htctornado 	= "armv5te"
+FEED_ARCH_htcuniversal 	= "armv5te"
+FEED_ARCH_hx2000 	= "armv5te"
+FEED_ARCH_hx4700 	= "armv5te"
+FEED_ARCH_ixp4xxle 	= "armv5te"
+FEED_ARCH_logicpd-pxa270 = "armv5te"
+FEED_ARCH_looxc550 	= "armv5te"
+FEED_ARCH_lsarm 	= "armv5te"
+FEED_ARCH_magician 	= "armv5te"
+FEED_ARCH_mainstone 	= "armv5te"
+FEED_ARCH_mnci 		= "armv5te"
+FEED_ARCH_mtx-3 	= "armv5te"
+FEED_ARCH_mx21ads 	= "armv5te"
+FEED_ARCH_n2100 	= "armv5te"
+FEED_ARCH_navman-icn330 = "armv5te"
+FEED_ARCH_netbook-pro 	= "armv5te"
+FEED_ARCH_nokia770 	= "armv5te"
+FEED_ARCH_rokre2 	= "armv5te"
+FEED_ARCH_nslu2le 	= "armv5te"
+FEED_ARCH_omap1510inn 	= "armv5te"
+FEED_ARCH_omap1610h2 	= "armv5te"
+FEED_ARCH_omap1710h3 	= "armv5te"
+FEED_ARCH_omap5912osk 	= "armv5te"
+FEED_ARCH_palmld 	= "armv5te"
+FEED_ARCH_palmt650 	= "armv5te"
+FEED_ARCH_palmt680 	= "armv5te"
+FEED_ARCH_palmtc 	= "armv5te"
+FEED_ARCH_palmtt 	= "armv5te"
+FEED_ARCH_palmtt3 	= "armv5te"
+FEED_ARCH_palmtt5 	= "armv5te"
+FEED_ARCH_palmtx 	= "armv5te"
+FEED_ARCH_palmz31 	= "armv5te"
+FEED_ARCH_palmz71 	= "armv5te"
+FEED_ARCH_palmz72 	= "armv5te"
+FEED_ARCH_poodle 	= "armv5te"
+FEED_ARCH_qemuarm 	= "armv5te"
+FEED_ARCH_spitz 	= "armv5te"
+FEED_ARCH_tosa 		= "armv5te"
+FEED_ARCH_triton 	= "armv5te"
+
+FEED_ARCH_ixp4xxbe 	= "armv5teb"
+FEED_ARCH_nslu2be 	= "armv5teb"
+
+# armv6
+
+FEED_ARCH_mx31ads 	= "armv6"
+FEED_ARCH_nokia800	= "armv6"  
+FEED_ARCH_omap2420h4	= "armv6"
+FEED_ARCH_omap2430sdp   = "armv6"
+
+#i486 machines
+FEED_ARCH_geodegx 	= "i486"
+FEED_ARCH_geodelx 	= "i486"
+FEED_ARCH_netvista 	= "i486"
+FEED_ARCH_wrap 		= "i486"
+FEED_ARCH_x86 		= "i486"
+
+#i586 machines
+FEED_ARCH_epia 		= "i586"
+FEED_ARCH_i586-generic 	= "i586"
+FEED_ARCH_qemux86 	= "i586"
+
+#i686 machines
+
+FEED_ARCH_alix 		= "i686"
+FEED_ARCH_colinux	= "i686"
+FEED_ARCH_guinness 	= "i686"
+FEED_ARCH_i686-generic 	= "i686"
+FEED_ARCH_progear 	= "i686"
+
+#powerpc machines
+
+FEED_ARCH_dht-walnut 	= "ppc405"
+FEED_ARCH_magicbox 	= "ppc405"
+FEED_ARCH_xilinx-ml403 	= "ppc405"
+FEED_ARCH_xilinx-ml410 	= "ppc405"
+FEED_ARCH_sequoia 	= "ppc440e"
+FEED_ARCH_efika 	= "ppc603e"
+FEED_ARCH_lite5200 	= "ppc603e"
+FEED_ARCH_lsppchd 	= "ppc603e"
+FEED_ARCH_lsppchg 	= "ppc603e"
+FEED_ARCH_storcenter 	= "ppc603e"
+FEED_ARCH_turbostation 	= "ppc603e"
+
+
+#strongarm machines, no EABI
+
+FEED_ARCH_collie 	= "arm-oabi"
+FEED_ARCH_h3600 	= "arm-oabi"
+FEED_ARCH_h3800 	= "arm-oabi"
+FEED_ARCH_htcwallaby 	= "arm-oabi"
+FEED_ARCH_jornada56x 	= "arm-oabi"
+FEED_ARCH_jornada7xx 	= "arm-oabi"
+FEED_ARCH_shark 	= "arm-oabi"
+FEED_ARCH_simpad 	= "arm-oabi"
+
+
+#Tweak packaging for strongarm machines since they can't use EABI
+
+PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3600  = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_h3800  = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_simpad = "arm-oabi"
+PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
+
+
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROM_MODE}-${DISTRO_VERSION}-${MACHINE}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
@@ -46,6 +210,53 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 # Angstrom *always* has some form of release config, so error out if someone thinks he knows better 
 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')}"
 
+
+# Configuration for tinderbox, so people only need:
+# INHERIT          += "tinderclient"
+# in their local.conf 
+
+#Name of the client
+TINDER_MACHINE  = "${MACHINE}-${ANGSTROM_MODE}-build-image"
+
+# Which lof file to write to, which tree to report to
+TINDER_LOG        = "${TMPDIR}/tinder.log"
+TINDER_TREE       = "Angstrom"
+
+# HTTP posting    
+TINDER_HOST       ?= "ewi546.ewi.utwente.nl"
+TINDER_URL        ?= "/tinderbox"
+
+# Which branch do we build
+TINDER_BRANCH     = "org.openembedded.dev"
+   
+## Clobbing
+## 0 for rebuilding everything from scratch
+## 1 for incremental builds
+TINDER_CLOBBER    = "1"
+
+## Do a report at all
+TINDER_REPORT     = "1"
+
+# Configuration for seppuku autobuilder, people only need to put:
+# INHERIT += "seppuku"
+# SEPPUKU_USER         = "your_bugzilla@user.id"
+# SEPPUKU_PASS         = "your_bugzilla_password"
+# in their local.conf
+
+# seppuku bbclass
+SEPPUKU_LOGIN        = "http://bugs.openembedded.org/query.cgi?"
+SEPPUKU_QUERY       = "http://bugs.openembedded.org/buglist.cgi?"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ADDCOMMENT   = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?"
+SEPPUKU_AUTOBUILD = "1"
+
+SEPPUKU_PRODUCT      = "Openembedded"
+SEPPUKU_COMPONENT    = "build"
+
+
+
+
+
 # We want images supporting the following features (for task-base)
 DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
 DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
diff --git a/conf/machine/gumstix-connex.conf b/conf/machine/gumstix-connex.conf
index 5110e86aff..a431762d0a 100644
--- a/conf/machine/gumstix-connex.conf
+++ b/conf/machine/gumstix-connex.conf
@@ -1,2 +1,6 @@
 require conf/machine/include/gumstix.inc
 
+MACHINE_FEATURES += " usbgadget "
+
+GUMSTIX_400MHZ = "y"
+
diff --git a/conf/machine/gumstix-verdex.conf b/conf/machine/gumstix-verdex.conf
index f08e3bafad..ab24552646 100644
--- a/conf/machine/gumstix-verdex.conf
+++ b/conf/machine/gumstix-verdex.conf
@@ -2,3 +2,5 @@ require conf/machine/include/gumstix.inc
 
 PACKAGE_EXTRA_ARCHS += " iwmmxt "
 
+MACHINE_FEATURES += " usbhost "
+
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index 9d51cdcead..c271940f63 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -13,17 +13,13 @@ module_autoload_mmc_block = "mmc_block"
 module_autoload_gumstix_gadget = "gumstix_gadget"
 module_autoload_g_ether = "g_ether"
 
-OLDEST_KERNEL = "2.6.15"
-
 UBOOT_ENTRYPOINT = "a0008000"
 
 #Assume people have some gumstix extension boards 
-MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget bluetooth"
+MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
 
-GUMSTIX_400MHZ = "y"
-
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-unix \
                              kernel-module-rtc-core \
                              kernel-module-rtc-dev \
diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.conf
index 68316f36bf..a69df825c0 100644
--- a/conf/machine/include/tune-arm1136jf-s.conf
+++ b/conf/machine/include/tune-arm1136jf-s.conf
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
-PACKAGE_ARCH = "armv6"
\ No newline at end of file
+FEED_ARCH = "armv6"
+PACKAGE_ARCH = "armv6"
diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf
index 373bf46727..b142d3325a 100644
--- a/conf/machine/include/tune