diff options
| author | Erik Hovland <erik@hovland.org> | 2006-05-19 23:10:29 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-19 23:10:29 +0000 |
| commit | 5df2eacd530758fbd5cca526f606d2e95417c0ed (patch) | |
| tree | bec832af2d49aca45cd4443a956c221fe0e1b0ee /packages | |
| parent | 9c257cb57a9bc7bbbf90310cf592aeaa24cc1960 (diff) | |
| parent | c2420f459bde3d91cc8fc4b585e1ba49edb858f0 (diff) | |
merge of 46c1cdea7bf65d8ba6bbe951e7408d24d5b05d06
and 8cd65284f1d330175ae2d67c03b8a2c1b41e858a
Diffstat (limited to 'packages')
109 files changed, 4052 insertions, 382 deletions
diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab index 31e2edb831..06b9672504 100644 --- a/packages/base-files/base-files/poodle/fstab +++ b/packages/base-files/base-files/poodle/fstab @@ -2,6 +2,11 @@ /dev/mtdblock3 /home jffs2 defaults,noatime 1 2 proc /proc proc defaults 0 0 /dev/hda1 /media/cf auto defaults,sync,noauto 0 0 + +# SD/MMC in kernel 2.6 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 + +# SD/MMC in kernel 2.4 /dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 tmpfs /var tmpfs defaults 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 8fec5b01d4..cbf0cc772a 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r49" +PR = "r50" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index c68df7bd47..db5ddf066d 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -8,6 +8,7 @@ LICENSE = "GPL" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ file://blueboxes.patch;patch=1 \ + file://no-user-include.patch;patch=1 \ file://hcid.conf \ file://bluetooth.default \ file://bluetooth.conf \ diff --git a/packages/bluez/files/no-user-include.patch b/packages/bluez/files/no-user-include.patch new file mode 100644 index 0000000000..8c1b1b6d6d --- /dev/null +++ b/packages/bluez/files/no-user-include.patch @@ -0,0 +1,18 @@ +Do not add -I/usr/include to the compile line just because we will +install bluez-utils there says zecke... + +Index: bluez-utils-2.25/acinclude.m4 +=================================================================== +--- bluez-utils-2.25.orig/acinclude.m4 2006-05-18 12:39:57.473577920 +0200 ++++ bluez-utils-2.25/acinclude.m4 2006-05-19 00:58:52.694599848 +0200 +@@ -69,7 +69,9 @@ + ac_save_LDFLAGS=$LDFLAGS + + BLUEZ_CFLAGS="" +- test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include" ++ if test "$cross_compiling" = no; then ++ test -d "${bluez_prefix}/include" && BLUEZ_CFLAGS="$BLUEZ_CFLAGS -I${bluez_prefix}/include" ++ fi + + CPPFLAGS="$CPPFLAGS $BLUEZ_CFLAGS" + AC_CHECK_HEADER(bluetooth/bluetooth.h, dummy=yes, AC_MSG_ERROR(Bluetooth header files not found)) diff --git a/packages/busybox/busybox-1.01/uclibc_posix.patch b/packages/busybox/busybox-1.01/uclibc_posix.patch index aefb994068..186f3f9c3a 100644 --- a/packages/busybox/busybox-1.01/uclibc_posix.patch +++ b/packages/busybox/busybox-1.01/uclibc_posix.patch @@ -1,12 +1,13 @@ see http://www.busybox.net/lists/busybox/2004-December/013276.html +and http://bugs.openembedded.org/show_bug.cgi?id=657 ---- busybox-old/libbb/loop.c 2004-08-16 04:36:28.000000000 -0400 -+++ busybox/libbb/loop.c 2004-12-04 23:45:58.000000000 -0500 +--- busybox-1.01/libbb/loop.c 2006/03/13 22:18:47 1.1 ++++ busybox-1.01/libbb/loop.c 2006/03/13 22:19:57 @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -+#include <asm/posix_types.h> ++#include <linux/types.h> #include <stdio.h> #include <errno.h> #include <fcntl.h> diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb index 996b5418a4..1e2f41fcba 100644 --- a/packages/busybox/busybox_1.01.bb +++ b/packages/busybox/busybox_1.01.bb @@ -10,12 +10,12 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r11" +PR = "r12" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcppidfile.patch;patch=1 \ file://udhcppidfile-breakage.patch;patch=1 \ - file://add-getkey-applet.patch;patch=1 \ + file://add-getkey-applet.patch;patch=1 \ file://below.patch;patch=1 \ file://dhcp-hostname.patch;patch=1 \ file://dhcpretrytime.patch;patch=1 \ @@ -28,14 +28,15 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://rmmod.patch;patch=1 \ file://udhcpscript.patch;patch=1 \ file://thu |