[oe-commits] org.oe.dev merge of '0c41f3612b1aad220f3804e0288528ad8eba750d'

[rwhitby commit]

merge of '0c41f3612b1aad220f3804e0288528ad8eba750d'
     and '82e43060128c986b8be96797125a37a72d6d6aef'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: cb41a381e7a0c491e5968be15cd985dc75d92aaf
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cb41a381e7a0c491e5968be15cd985dc75d92aaf
Files:
1
packages/bluez/bluez-gnome_0.7.bb
conf/distro/angstrom-2007.1.conf
packages/linux/linux-ezx_2.6.21.bb
Diffs:

#
# mt diff -r0c41f3612b1aad220f3804e0288528ad8eba750d -rcb41a381e7a0c491e5968be15cd985dc75d92aaf
#
# 
# 
# add_file "packages/bluez/bluez-gnome_0.7.bb"
#  content [6841233421c5e08a0657919d990abdc76ffac9e7]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [236d7e78b5ee518ce6f353debe5bed3d63589170]
#    to [5f2ea0dd2ad015c8ba74a060916a7b93eea809b1]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [a0165eda03a84d4b929cebccbb94574bb7b38c28]
#    to [9f894c27c8f97b8394f1ae82e158e7573dd396b5]
# 
============================================================
--- packages/bluez/bluez-gnome_0.7.bb	6841233421c5e08a0657919d990abdc76ffac9e7
+++ packages/bluez/bluez-gnome_0.7.bb	6841233421c5e08a0657919d990abdc76ffac9e7
@@ -0,0 +1,11 @@
+DESCRIPTION = "BLuetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+DEPENDS = "dbus-glib gconf libnotify gtk+"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig gconf
+
+FILES_${PN} += "${datadir}/gconf"
+
============================================================
--- conf/distro/angstrom-2007.1.conf	236d7e78b5ee518ce6f353debe5bed3d63589170
+++ conf/distro/angstrom-2007.1.conf	5f2ea0dd2ad015c8ba74a060916a7b93eea809b1
@@ -219,11 +219,6 @@ PREFERRED_VERSION_binutils-cross-sdk ?= 
 PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 
-PREFERRED_VERSION_linux-libc-headers_i486 ?= "2.6.18"
-PREFERRED_VERSION_linux-libc-headers_i586 ?= "2.6.18"
-PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18"
-PREFERRED_VERSION_linux-libc-headers_powerpc ?= "2.6.18"
-PREFERRED_VERSION_linux-libc-headers_ixp4xx ?= "2.6.18"
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
 
 PREFERRED_VERSION_glibc ?= "2.5"
============================================================
--- packages/linux/linux-ezx_2.6.21.bb	a0165eda03a84d4b929cebccbb94574bb7b38c28
+++ packages/linux/linux-ezx_2.6.21.bb	9f894c27c8f97b8394f1ae82e158e7573dd396b5
@@ -63,7 +63,10 @@ COMPATIBLE_MACHINE = '(a780|e680)'
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = '(a780|e680)'
 
-CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 noinitrd"
+# For now the code for serial console is disabled in compress.c
+#CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 noinitrd"
+CMDLINE_CON = "console=tty1 noinitrd"
+
 CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"
 # uncomment if you want to boot over NFS
 #CMDLINE_ROOT = "root=/dev/nfs nfsroot=192.168.1.10:/export/opie-image rootdelay=5 3"


#
# mt diff -r82e43060128c986b8be96797125a37a72d6d6aef -rcb41a381e7a0c491e5968be15cd985dc75d92aaf
#
# 
# no changes
#