propagate from branch 'org.openembedded.dev' (head a9d8dbf4fa950567435550e72514ae1d5ba70efe)

            to branch 'org.openembedded.dev.avr32' (head 98a24ed978fa92519a7d390465714a7742060284)

42 files changed, 826 insertions, 883 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 7486400651..831ab8b0ee 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -58,26 +58,6 @@ PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh17"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
-# Needed for crappy ipaqs with broken hostap in the kernel
-PREFERRED_VERSION_hostap-modules                    ?= "0.4.7"
-PREFERRED_VERSION_hostap-utils                      ?= "0.4.7"
-
-PREFERRED_VERSION_file         = "4.18"
-PREFERRED_VERSION_file_native  = "4.18"
-
-PREFERRED_VERSION_fontconfig       = "2.4.1"
-PREFERRED_VERSION_freetype         = "2.3.4"
-PREFERRED_VERSION_freetype-native  = "2.2.1"
-PREFERRED_VERSION_cairo            = "1.4.10"
-PREFERRED_VERSION_glib-2.0         = "2.12.12"
-PREFERRED_VERSION_pango            = "1.16.4"
-PREFERRED_VERSION_atk              = "1.20.0"
-PREFERRED_VERSION_gtk+             = "2.10.14"
-
-# newer poppler cvs breaks some apps, fix until popper 6 and apps
-# catch up with api changes
-# PREFERRED_VERSION_poppler          = "0.5.4"
-
 # older gtk-webcore releases don't work on ARM/EABI
 # We need to switch to a fixed SRCDATE or release as soon as possible 
 PREFERRED_VERSION_osb-browser      = "0.5.0+svn${SRCDATE}"
@@ -91,14 +71,10 @@ PREFERRED_PROVIDER_avahi = "avahi"
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
-PREFERRED_VERSION_xserver-kdrive    ?= "1.3.0.0"
 PREFERRED_VERSION_libxrandr         ?= "1.2.1"
 PREFERRED_VERSION_xrandr            ?= "1.2.0" 
 PREFERRED_VERSION_randrproto        ?= "1.2.1"
 
-PREFERRED_VERSION_libgnomeui         = "2.18.1"
-PREFERRED_VERSION_prismstumbler      = "0.7.3"
-
 #use EABI ready toolchain
 PREFERRED_VERSION_gcc               ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross         ?= "4.1.2"
@@ -135,18 +111,11 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 # PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
 # PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
 
-
-# Busybox <1.1.0 doesn't have EABI support
-PREFERRED_VERSION_busybox = "1.2.1"
-
-PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.74"
-
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
+require conf/distro/include/angstrom-2007-preferred-versions.inc
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions.inc
-require conf/distro/include/preferred-openmoko-versions.inc
 
 
 # Virtuals:
@@ -211,10 +180,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 #Silence a warning during parsing
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
-
-# Lock down almost every recipe:
-require conf/distro/include/angstrom-2007-preferred-versions.inc 
-
 #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
 ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 require conf/distro/include/angstrom${ARM_ABI}.inc
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 536bb462eb..265b572d66 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -74,7 +74,7 @@ PREFERRED_VERSION_gcc-cross             = "4.2.1"
 PREFERRED_VERSION_gcc-cross-initial    	= "4.1.2"
 
 #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.22"
+PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
 
 #Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
 PREFERRED_VERSION_glibc 		= "2.6.1"
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index c3a8fcc9ec..08f4864ff3 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -620,6 +620,7 @@ PREFERRED_VERSION_gst-plugins-good ?= "0.10.6"
 PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.6"
 PREFERRED_VERSION_gstreamer ?= "0.10.14"
 PREFERRED_VERSION_gthumb ?= "2.6.9"
+PREFERRED_VERSION_gtk+ ?= "2.10.14"
 PREFERRED_VERSION_gtk-clearlooks-engine ?= "0.6.2"
 PREFERRED_VERSION_gtk-doc ?= "1.0"
 PREFERRED_VERSION_gtk-doc-native ?= "1.0"
@@ -2086,7 +2087,7 @@ PREFERRED_VERSION_xrdb ?= "1.0.4"
 PREFERRED_VERSION_xscreensaver ?= "4.22"
 PREFERRED_VERSION_xscrnsaverh ?= "1.0"
 PREFERRED_VERSION_xserver-common ?= "1.18"
-PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-kdrive    ?= "1.3.0.0"
 PREFERRED_VERSION_xserver-kdrive-common ?= "0.1"
 PREFERRED_VERSION_xserver-nodm-init ?= "1.0"
 PREFERRED_VERSION_xserver-xorg ?= "1.3.0.0"
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
index c70e799705..b085a44261 100644
--- a/conf/distro/include/insane-srcrevs.inc
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -19,6 +19,7 @@ SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}"
 SRCREV_pn-libmokoui2 ?= "${AUTOREV}"
 SRCREV_pn-libowl ?= "${AUTOREV}"
 SRCREV_pn-libxosd ?= "${AUTOREV}"
+SRCREV_pn-linux-openmoko ?= "${AUTOREV}"
 SRCREV_pn-llvm-gcc4 ?= "${AUTOREV}"
 SRCREV_pn-llvm-gcc4-cross ?= "${AUTOREV}"
 SRCREV_pn-maemo-mapper ?= "${AUTOREV}"
diff --git a/conf/distro/include/preferred-openmoko-versions.inc b/conf/distro/include/preferred-openmoko-versions.inc
deleted file mode 100644
index c002776d70..0000000000
--- a/conf/distro/include/preferred-openmoko-versions.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Specify which versions of OpenMoko packages to build
-#
-
-#
-# Bootloader and Kernel
-#
-
-SRCREV_pn-linux-openmoko ?= "2937"
-
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e537c66c30..e79abfd1ce 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -16,7 +16,7 @@ SRCREV_pn-dfu-util-native ?= "2866"
 SRCREV_pn-eglibc ?= "3531"
 SRCREV_pn-eglibc-initial ?= "3531"
 SRCREV_pn-eglibc-intermediate ?= "3531"
-SRCREV_pn-ezxd ?= "2070"
+SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt="1786"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
@@ -38,10 +38,11 @@ SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3745"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
+SRCREV_pn-linux-openmoko ?= "2937"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "108"
-SRCREV_pn-matchbox-desktop-2 ?= "1649"
+SRCREV_pn-matchbox-desktop-2 ?= "1778"
 SRCREV_pn-matchbox-keyboard ?= "1739"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
@@ -55,7 +56,7 @@ SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appearance ?= "3239"
 SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3299"
+SRCREV_pn-openmoko-appmanager2 ?= "3338"
 SRCREV_pn-openmoko-browser2 ?= "3249"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "3235"
@@ -64,7 +65,7 @@ SRCREV_pn-openmoko-common2 ?= "2679"
 SRCREV_pn-openmoko-contacts ?= "2298"
 SRCREV_pn-openmoko-contacts2 ?= "358"
 SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "658"
+SRCREV_pn-openmoko-dates2 ?= "659"
 SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "3298"
 SRCREV_pn-openmoko-feedreader2 ?= "3080"
@@ -98,10 +99,10 @@ SRCREV_pn-openmoko-tasks2 ?= "346"
 SRCREV_pn-openmoko-terminal2 ?= "2972"
 SRCREV_pn-openmoko-theme-standard ?= "2370"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
-SRCREV_pn-openmoko-theme-standard2 ?= "3210"
-SRCREV_pn-openmoko-theme-standard2-qvga ?= "3210"
+SRCREV_pn-openmoko-theme-standard2 ?= "3289"
+SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289"
 SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3287"
+SRCREV_pn-openmoko-today2 ?= "3342"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
 SRCREV_pn-openmoko-worldclock2 ?= "3301"
 SRCREV_pn-openocd ?= "206"
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index 0f2716b0db..758f6c612f 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -37,8 +37,6 @@ PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
 # we want the openmoko svn version of gsmd
 PREFERRED_PROVIDER_libgsmd = "libgsmd"
 
-require conf/distro/include/preferred-openmoko-versions.inc
-
 # Bleeding-edge developers should add the following line to their local.conf:
 # require conf/distro/include/moko-autorev.inc
 
@@ -62,7 +60,7 @@ PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
 
-# Select packge versions we wash to use.
+# Select package versions we want to use.
 PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
 
diff --git a/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb
new file mode 100644
index 0000000000..60b44dbc8e
--- /dev/null
+++ b/packages/alsa/alsa-lib_1.0.15.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "Alsa sound library"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+
+# configure.in sets -D__arm__ on the command line for any arm system
+# (not just those with the ARM instruction set), this should be removed,
+# (or replaced by a permitted #define).
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+           file://fix-tstamp-declaration.patch;patch=1"
+
+inherit autotools pkgconfig
+
+require alsa-fpu.inc
+EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
+
+do_stage () {
+	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
+	install -d ${STAGING_INCDIR}/alsa/sound
+	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
+	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
+FILES_libasound = "${libdir}/libasound.so.*"
+FILES_alsa-server = "${bindir}/*"
+FILES_alsa-conf = "${datadir}/alsa/"
+FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
+FILES_alsa-conf-base = "\
+${datadir}/alsa/alsa.conf \
+${datadir}/alsa/cards/aliases.conf \
+${datadir}/alsa/pcm/default.conf \
+${datadir}/alsa/pcm/dmix.conf \
+${datadir}/alsa/pcm/dsnoop.conf"
+
+RDEPENDS_libasound = "alsa-conf-base"
diff --git a/packages/alsa/alsa-oss_1.0.15.bb b/packages/alsa/alsa-oss_1.0.15.bb
new file mode 100644
index 0000000000..b11947e86a
--- /dev/null
+++ b/packages/alsa/alsa-oss_1.0.15.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Alsa OSS Compatibility Package"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
+
+inherit autotools 
+
+do_configure_prepend () {
+	touch NEWS README AUTHORS ChangeLog
+}
+
+do_stage () {
+	oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
+	oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
+}
diff --git a/packages/alsa/alsa-utils_1.0.14.bb b/packages/alsa/alsa-utils_1.0.14.bb
index 240b995e7b..25eeade7cd 100644
--- a/packages/alsa/alsa-utils_1.0.14.bb
+++ b/packages/alsa/alsa-utils_1.0.14.bb
@@ -3,16 +3,11 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
-
-# lazy hack. needs proper fixing in gettext.m4, see
-# http://bugs.openembedded.org/show_bug.cgi?id=2348
-# please close bug and remove this comment when properly fixed
-#
-EXTRA_OECONF_linux-uclibc = "--disable-nls"
-EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
-
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+	   file://alsa-utils-automake.patch;patch=1 \
+	  "
 inherit autotools
 
 # This are all packages that we need to make. Also, the now empty alsa-utils
diff --git a/packages/alsa/alsa-utils_1.0.15.bb b/packages/alsa/alsa-utils_1.0.15.bb
new file mode 100644
index 0000000000..b271e75439
--- /dev/null
+++ b/packages/alsa/alsa-utils_1.0.15.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "ALSA Utilities"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib ncurses"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+           file://alsa-utils-automake.patch;patch=1 \
+	  "
+
+inherit autotools
+
+# This are all packages that we need to make. Also, the now empty alsa-utils
+# ipk depend on them.
+
+PACKAGES += "\
+             alsa-utils-alsamixer \
+             alsa-utils-midi \
+             alsa-utils-aplay \
+             alsa-utils-amixer \
+             alsa-utils-aconnect \
+             alsa-utils-iecset \
+             alsa-utils-speakertest \
+             alsa-utils-aseqnet \
+             alsa-utils-aseqdump \
+             alsa-utils-alsaconf \
+             alsa-utils-alsactl "
+
+# We omit alsaconf, because
+# a) this is a bash script
+# b) it creates config files not suitable for OE-based distros
+
+FILES_${PN} = ""
+FILES_alsa-utils-aplay       = "${bindir}/aplay ${bindir}/arecord"
+FILES_alsa-utils-amixer      = "${bindir}/amixer"
+FILES_alsa-utils-alsamixer   = "${bindir}/alsamixer"
+FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/"
+FILES_alsa-utils-midi        = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
+FILES_alsa-utils-aconnect    = "${bindir}/aconnect"
+FILES_alsa-utils-aseqnet     = "${bindir}/aseqnet"
+FILES_alsa-utils-iecset      = "${bindir}/iecset"
+FILES_alsa-utils-alsactl     = "${sbindir}/alsactl"
+FILES_alsa-utils-aseqdump    = "${bindir}/aseqdump"
+FILES_alsa-utils-alsaconf    = "${sbindir}/alsaconf"
+
+DESCRIPTION_alsa-utils-aplay        = "play (and record) sound files via ALSA"
+DESCRIPTION_alsa-utils-amixer       = "command-line based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-alsamixer    = "ncurses based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-speakertest  = "ALSA surround speaker test utility"
+DESCRIPTION_alsa-utils-midi         = "miscalleanous MIDI utilities for ALSA"
+DESCRIPTION_alsa-utils-aconnect     = "ALSA sequencer connection manager"
+DESCRIPTION_alsa-utils-aseqnet      = "network client/server on ALSA sequencer"
+DESCRIPTION_alsa-utils-alsactl      = "saves/restores ALSA-settings in /etc/asound.state"
+DESCRIPTION_alsa-utils-alsaconf     = "a bash script that creates ALSA configuration files"
+
+ALLOW_EMPTY_alsa-utils = "1"
diff --git a/packages/alsa/files/alsa-utils-automake.patch b/packages/alsa/files/alsa-utils-automake.patch
new file mode 100644
index 0000000000..de0eee94fd
--- /dev/null
+++ b/packages/alsa/files/alsa-utils-automake.patch
@@ -0,0 +1,10 @@
+Index: alsa-utils-1.0.14/seq/aseqnet/Makefile.am
+===================================================================
+--- alsa-utils-1.0.14.orig/seq/aseqnet/Makefile.am	2007-05-31 10:07:21.000000000 +0200
++++ alsa-utils-1.0.14/seq/aseqnet/Makefile.am	2007-10-31 21:11:41.000000000 +0100
+@@ -3,4 +3,5 @@
+ 
+ bin_PROGRAMS = aseqnet
+ aseqnet_SOURCES = aseqnet.c
++aseqnet_LDADD = $(INTLLIBS)
+ man_MANS = aseqnet.1
diff --git a/packages/bluez/bluez-cups-backend_3.22.bb b/packages/bluez/bluez-cups-backend_3.22.bb
new file mode 100644
index 0000000000..64884fa904
--- /dev/null
+++ b/packages/bluez/bluez-cups-backend_3.22.bb
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+DEPENDS += "cups"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --disable-alsa \ 
+		 --enable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_${PN} = "cups"
\ No newline at end of file
diff --git a/packages/bluez/bluez-gstreamer-plugin_3.22.bb b/packages/bluez/bluez-gstreamer-plugin_3.22.bb
new file mode 100644
index 0000000000..c5a1a9acee
--- /dev/null
+++ b/packages/bluez/bluez-gstreamer-plugin_3.22.bb
@@ -0,0 +1,26 @@
+require bluez-utils3.inc
+
+DEPENDS += "gstreamer gst-plugins-base "
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --enable-alsa \ 
+		 --disable-cups \
+		 --enable-glib \
+		 --enable-gstreamer \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so"
diff --git a/packages/bluez/bluez-libs_3.22.bb b/packages/bluez/bluez-libs_3.22.bb
new file mode 100644
index 0000000000..6ddf62a4fb
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.22.bb
@@ -0,0 +1 @@
+require bluez-libs.inc
diff --git a/packages/bluez/bluez-utils-alsa_3.22.bb b/packages/bluez/bluez-utils-alsa_3.22.bb
new file mode 100644
index 0000000000..e2f48fba49
--- /dev/null
+++ b/packages/bluez/bluez-utils-alsa_3.22.bb
@@ -0,0 +1,24 @@
+require bluez-utils3.inc
+
+DEPENDS += "alsa-lib"
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --disable-hid2hci \
+                 --enable-alsa \ 
+		 --disable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/alsa-lib/libasound*"
diff --git a/packages/bluez/bluez-utils_3.22.bb b/packages/bluez/bluez-utils_3.22.bb
new file mode 100644
index 0000000000..48f147aa69
--- /dev/null
+++ b/packages/bluez/bluez-utils_3.22.bb
@@ -0,0 +1,29 @@
+require bluez-utils3.inc
+
+# see bluez-utils3.inc for the explanation of these option
+EXTRA_OECONF = " \
+                 --enable-bccmd \
+		 --enable-hid2hci \
+                 --disable-alsa \ 
+		 --disable-cups \
+		 --enable-glib \
+		 --disable-sdpd \
+	         --enable-network \
+	         --enable-serial \
+	         --enable-input \
+	         --enable-audio \
+	         --enable-echo \
+                 --enable-configfile \
+	         --enable-initscripts \
+		 --enable-test \
+		" 
+
+CONFFILES_${PN} = " \
+                   ${sysconfdir}/bluetooth/hcid.conf \
+                   ${sysconfdir}/default/bluetooth \
+                  "
+
+CONFFILES_${PN}-compat = " \
+                          ${sysconfdir}/bluetooth/rfcomm.conf \
+                         "
+
diff --git a/packages/busybox/busybox-1.7.2/angstrom/defconfig b/packages/busybox/busybox-1.7.2/angstrom/defconfig
deleted file mode 100644
index 19cfafab2c..0000000000
--- a/packages/busybox/busybox-1.7.2/angstrom/defconfig
+++ /dev/null
@@ -1,753 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.7.2
-# Fri Oct 12 19:00:27 2007
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_NITPICK is not set
-# CONFIG_DESKTOP is not set
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-CONFIG_FEATURE_COMPRESS_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-CONFIG_LOCALE_SUPPORT=y
-CONFIG_GETOPT_LONG=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_PIDFILE=y
-CONFIG_FEATURE_SUID=y
-CONFIG_FEATURE_SUID_CONFIG=y
-CONFIG_FEATURE_SUID_CONFIG_QUIET=y
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_BUILD_AT_ONCE=y
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=2
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_FANCY_KEYS is not set
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-CONFIG_FEATURE_TAB_COMPLETION=y
-CONFIG_FEATURE_USERNAME_COMPLETION=y
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-CONFIG_AR=y
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_BUNZIP2=y
-CONFIG_CPIO=y
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
-CONFIG_GZIP=y
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-# CONFIG_FEATURE_RPM_BZ2 is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_COMPRESS is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-CONFIG_UNZIP=y
-
-#
-# Common options for cpio and tar
-#
-# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
-# CONFIG_FEATURE_DEB_TAR_GZ is not set
-# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
-# CONFIG_FEATURE_DEB_TAR_LZMA is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-# CONFIG_CAL is not set
-CONFIG_CAT=y
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_CUT=y
-CONFIG_DATE=y
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-CONFIG_DIRNAME=y