Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

4 files changed, 73 insertions, 2 deletions

diff --git a/packages/at76c503a/at76c503a-modules/at76_usb-0.17-.patch b/packages/at76c503a/at76c503a-modules/at76_usb-0.17-.patch
new file mode 100644
index 0000000000..06200f5ac7
--- /dev/null
+++ b/packages/at76c503a/at76c503a-modules/at76_usb-0.17-.patch
@@ -0,0 +1,66 @@
+--- at76_usb-0.17/at76_usb.c	2007-09-30 09:21:38.000000000 +0200
++++ at76_usb-0.17.1/at76_usb.c	2008-12-02 17:29:15.000000000 +0100
+@@ -2327,7 +2327,7 @@
+ 		iwe->cmd = SIOCGIWAP;
+ 		iwe->u.ap_addr.sa_family = ARPHRD_ETHER;
+ 		memcpy(iwe->u.ap_addr.sa_data, curr_bss->bssid, 6);
+-		curr_pos = iwe_stream_add_event(curr_pos,
++		curr_pos = iwe_stream_add_event(info, curr_pos,
+ 						extra + IW_SCAN_MAX_DATA, iwe,
+ 						IW_EV_ADDR_LEN);
+ 
+@@ -2335,7 +2335,7 @@
+ 		iwe->cmd = SIOCGIWESSID;
+ 		iwe->u.data.flags = 1;
+ 
+-		curr_pos = iwe_stream_add_point(curr_pos,
++		curr_pos = iwe_stream_add_point(info, curr_pos,
+ 						extra + IW_SCAN_MAX_DATA, iwe,
+ 						curr_bss->ssid);
+ 
+@@ -2346,14 +2346,14 @@
+ 		    IW_MODE_MASTER : IW_MODE_AUTO;
+ 		/* IW_MODE_AUTO = 0 which I thought is
+ 		 * the most logical value to return in this case */
+-		curr_pos = iwe_stream_add_event(curr_pos,
++		curr_pos = iwe_stream_add_event(info, curr_pos,
+ 						extra + IW_SCAN_MAX_DATA, iwe,
+ 						IW_EV_UINT_LEN);
+ 
+ 		iwe->cmd = SIOCGIWFREQ;
+ 		iwe->u.freq.m = curr_bss->channel;
+ 		iwe->u.freq.e = 0;
+-		curr_pos = iwe_stream_add_event(curr_pos,
++		curr_pos = iwe_stream_add_event(info, curr_pos,
+ 						extra + IW_SCAN_MAX_DATA, iwe,
+ 						IW_EV_FREQ_LEN);
+ 
+@@ -2364,7 +2364,7 @@
+ 			iwe->u.data.flags = IW_ENCODE_DISABLED;
+ 
+ 		iwe->u.data.length = 0;
+-		curr_pos = iwe_stream_add_point(curr_pos,
++		curr_pos = iwe_stream_add_point(info, curr_pos,
+ 						extra + IW_SCAN_MAX_DATA, iwe,
+ 						NULL);
+ 
+@@ -2383,7 +2383,7 @@
+ 			iwe->u.qual.updated |= IW_QUAL_QUAL_INVALID;
+ 		}
+ 		/* Add new value to event */
+-		curr_pos = iwe_stream_add_event(curr_pos,
++		curr_pos = iwe_stream_add_event(info, curr_pos,
+ 						extra + IW_SCAN_MAX_DATA, iwe,
+ 						IW_EV_QUAL_LEN);
+ 
+@@ -2401,8 +2401,8 @@
+ 			iwe->u.bitrate.value =
+ 			    ((curr_bss->rates[i] & 0x7f) * 500000);
+ 			/* Add new value to event */
+-			curr_val = iwe_stream_add_value(curr_pos, curr_val,
+-							extra +
++			curr_val = iwe_stream_add_value(info, curr_pos,
++							curr_val, extra +
+ 							IW_SCAN_MAX_DATA, iwe,
+ 							IW_EV_PARAM_LEN);
+ 		}
diff --git a/packages/at76c503a/at76c503a-modules_0.17.bb b/packages/at76c503a/at76c503a-modules_0.17.bb
index 58b782b483..e0230ded84 100644
--- a/packages/at76c503a/at76c503a-modules_0.17.bb
+++ b/packages/at76c503a/at76c503a-modules_0.17.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "Driver for at76 based usb-wifi devices"
 SECTION = "base"
 LICENSE = "GPL"
 
-PR = "r1"
+PR = "r2"
 
 RDEPENDS = "at76c503-firmware"
 
 SRC_URI = "http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz"
+SRC_URI_ixp4xx = "http://download.berlios.de/at76c503a/at76_usb-0.17.tar.gz \
+                  file://at76_usb-0.17-.patch;patch=1"
 S = "${WORKDIR}/at76_usb-${PV}/"
 
 inherit module
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index a4e8b2944c..1428fdcd7b 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r62"
+PR = "r63"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -49,6 +49,7 @@ SLUGOS_PACKAGES = "\
 	bison \
 	bluez-utils \
 	bluez-hcidump \
+	bluez4 \
 	bogofilter \
 	bonnie++ \
 	boost \
diff --git a/packages/ntfs-3g/ntfs-3g_1.0.bb b/packages/ntfs-3g/ntfs-3g_1.0.bb
index 7d73b79ac9..ac2b384c9e 100644
--- a/packages/ntfs-3g/ntfs-3g_1.0.bb
+++ b/packages/ntfs-3g/ntfs-3g_1.0.bb
@@ -5,6 +5,8 @@ DEPENDS = "fuse"
 RDEPENDS = "fuse"
 PR = "r0"
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = http://www.ntfs-3g.org/ntfs-3g-${PV}.tgz
 
 inherit autotools