diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-05-21 20:53:23 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-05-21 20:53:23 +0000 |
| commit | eeae0ead4de39797ef077cca856ccf5821a05df3 (patch) | |
| tree | 00078331511f0e9952135ff6ed5fa5a4334e82bb | |
| parent | 3d7d4d04328d1a7410ddecd2da00ce5da86e6750 (diff) | |
| parent | 81e073458ef17927da238fdcf916f68f86f61a41 (diff) | |
merge of '0c41f3612b1aad220f3804e0288528ad8eba750d'
and '82e43060128c986b8be96797125a37a72d6d6aef'
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 5 | ||||
| -rw-r--r-- | packages/bluez/bluez-gnome_0.7.bb | 11 | ||||
| -rw-r--r-- | packages/linux/linux-ezx_2.6.21.bb | 5 |
3 files changed, 15 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 8a84984a4d..a654535b99 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -219,11 +219,6 @@ PREFERRED_VERSION_binutils ?= "2.17.50.0.5" 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" diff --git a/packages/bluez/bluez-gnome_0.7.bb b/packages/bluez/bluez-gnome_0.7.bb new file mode 100644 index 0000000000..d50e8e5fde --- /dev/null +++ b/packages/bluez/bluez-gnome_0.7.bb @@ -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" + diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb index 15f5771415..80c0122504 100644 --- a/packages/linux/linux-ezx_2.6.21.bb +++ b/packages/linux/linux-ezx_2.6.21.bb @@ -63,7 +63,10 @@ ALLOW_EMPTY = "1" 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" |