Re: [OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
Martin Jansa wrote on 2011-08-16: On Tue, Aug 16, 2011 at 10:40:38AM +0800, Cui, Dexuan wrote: Saul Wold wrote on 2011-08-16: On 08/12/2011 01:04 AM, Noor, Ahsan wrote: From: Noor Ahsannoor_ah...@mentor.com * Added new recipe 4.96 and removed 4.82 version and its files. Signed-off-by: Noor Ahsannoor_ah...@mentor.com Merged into OE-Core The patch causes a failure: NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed I reported http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this. You need patch from this commit http://git.openembedded.org/cgit.cgi/meta-openembedded/commit/?id=852 ac4b589adb186191ad70a2fa3472d5b351ec4 or upgrade to 2.1 Martin, thanks for the suggestion! Yes, I found 2.1 had integrated the fix, so I think we should choose to upgrade the package to 2.1 (I compared the source codes of 2.0 and 2.1 and looks they don't have many differences in other aspects). I'll send out a patch later today. Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
Cui, Dexuan wrote on 2011-08-16: Martin Jansa wrote on 2011-08-16: On Tue, Aug 16, 2011 at 10:40:38AM +0800, Cui, Dexuan wrote: Saul Wold wrote on 2011-08-16: On 08/12/2011 01:04 AM, Noor, Ahsan wrote: From: Noor Ahsannoor_ah...@mentor.com * Added new recipe 4.96 and removed 4.82 version and its files. Signed-off-by: Noor Ahsannoor_ah...@mentor.com Merged into OE-Core The patch causes a failure: NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed I reported http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this. You need patch from this commit http://git.openembedded.org/cgit.cgi/meta-openembedded/commit/?id=852 ac4b589adb186191ad70a2fa3472d5b351ec4 or upgrade to 2.1 Martin, thanks for the suggestion! Yes, I found 2.1 had integrated the fix, so I think we should choose to upgrade the package to 2.1 (I compared the source codes of 2.0 and 2.1 and looks they don't have many differences in other aspects). I'll send out a patch later today. This is the patch. http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=dcui/masterid=17e0fb707e9ad926058898d39d32168f4e582ed1 I'm testing my branch with other patches. So I'll wait for several hours (2~4 hours) and send out all the patches together. :-) Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
On 08/12/2011 01:04 AM, Noor, Ahsan wrote:
From: Noor Ahsannoor_ah...@mentor.com
* Added new recipe 4.96 and removed 4.82 version and its files.
Signed-off-by: Noor Ahsannoor_ah...@mentor.com
---
.../bluez/bluez4-4.82/bluetooth.conf | 16
.../fix-dfutool-usb-declaration-mismatch.patch | 20 -
.../bluez/bluez4-4.82/hid2hci_usb_init.patch | 35 -
.../bluez/bluez4-4.82/sbc-thumb.patch | 14
.../bluez/bluez4-4.96/bluetooth.conf | 16
meta/recipes-connectivity/bluez/bluez4_4.82.bb | 75
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 73 +++
7 files changed, 89 insertions(+), 160 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
deleted file mode 100644
index ca5e9e4..000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-!-- This configuration file specifies the required security policies
- for Bluetooth core daemon to work. --
-
-!DOCTYPE busconfig PUBLIC -//freedesktop//DTD D-BUS Bus Configuration
1.0//EN
- http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd;
-busconfig
-
-!-- ../system.conf have denied everything, so we just punch some holes --
-
-policy context=default
-allow own=org.bluez/
-allow send_destination=org.bluez/
-allow send_interface=org.bluez.Agent/
-/policy
-
-/busconfig
diff --git
a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
deleted file mode 100644
index 27dead0..000
---
a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# bluez4: add compile patch fixing some usb declaration mismatch
-# Author: Michael 'Mickey' Lauermic...@vanille-media.de
-# Date: Thu Jan 29 16:52:21 2009 +
-#
-# Acquired from OpenEmbedded
-Upstream-Status: Pending
-
-Index: bluez-4.27/tools/dfutool.c
-===
bluez-4.27.orig/tools/dfutool.c
-+++ bluez-4.27/tools/dfutool.c
-@@ -59,7 +59,7 @@
- #endif
-
- #ifdef NEED_USB_GET_BUSSES
--static inline struct usb_bus *usb_get_busses(void)
-+inline struct usb_bus *usb_get_busses(void)
- {
- return usb_busses;
- }
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
deleted file mode 100644
index e8a58e5..000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# Signed-off-by: Khem Rajraj.k...@gmail.com
-#
-# Use the new usb1 API for usb_init() and check for fails from
-# usb_init (). Currently we see a crash on a system which does
-# not have USB because usb_init() fails and it cleans up all initialized
-# data (e.g. ctx) which is used in subsequent calls to libusb
-# We return immediately if usb_init() fails for some reason.
-
-Upstream-Status: Inappropriate [not used]
-
-Index: bluez-4.24/tools/hid2hci.c
-===
bluez-4.24.orig/tools/hid2hci.c2008-10-25 23:40:34.0 -0700
-+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.0 -0800
-@@ -337,7 +337,7 @@
- int main(int argc, char *argv[])
- {
- struct device_info dev[16];
-- int i, opt, num, quiet = 0, mode = HCI;
-+ int i, ret, opt, num, quiet = 0, mode = HCI;
-
- while ((opt = getopt_long(argc, argv, +01qh, main_options, NULL)) !=
-1) {
- switch (opt) {
-@@ -361,8 +361,9 @@
- argc -= optind;
- argv += optind;
- optind = 0;
--
-- usb_init();
-+ ret = libusb_init();
-+ if (ret 0)
-+ return ret;
-
- num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
- if (num= 0) {
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
deleted file mode 100644
index 881cb9c..000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Acquired from OpenEmbedded
-Upstream-Status: Inappropriate [embedded specific]
-
bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.0 +
-+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.0 +
-@@ -59,7 +59,7 @@
-
- #define SBC_FIXED_0(val) { val = 0; }
- #define MUL(a, b)((a) * (b))
--#ifdef __arm__
-+#if defined(__arm__) !defined(__thumb__)
- #define MULA(a, b, res) ({\
- int tmp = res; \
- __asm__(\
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
Re: [OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
Op 15 aug. 2011 om 19:02 heeft Saul Wold s...@linux.intel.com het volgende
geschreven:
On 08/12/2011 01:04 AM, Noor, Ahsan wrote:
From: Noor Ahsannoor_ah...@mentor.com
* Added new recipe 4.96 and removed 4.82 version and its files.
Signed-off-by: Noor Ahsannoor_ah...@mentor.com
---
.../bluez/bluez4-4.82/bluetooth.conf | 16
.../fix-dfutool-usb-declaration-mismatch.patch | 20 -
.../bluez/bluez4-4.82/hid2hci_usb_init.patch | 35 -
.../bluez/bluez4-4.82/sbc-thumb.patch | 14
.../bluez/bluez4-4.96/bluetooth.conf | 16
meta/recipes-connectivity/bluez/bluez4_4.82.bb | 75
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 73
+++
7 files changed, 89 insertions(+), 160 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
deleted file mode 100644
index ca5e9e4..000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-!-- This configuration file specifies the required security policies
- for Bluetooth core daemon to work. --
-
-!DOCTYPE busconfig PUBLIC -//freedesktop//DTD D-BUS Bus Configuration
1.0//EN
- http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd;
-busconfig
-
-!-- ../system.conf have denied everything, so we just punch some holes --
-
-policy context=default
-allow own=org.bluez/
-allow send_destination=org.bluez/
-allow send_interface=org.bluez.Agent/
-/policy
-
-/busconfig
diff --git
a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
deleted file mode 100644
index 27dead0..000
---
a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# bluez4: add compile patch fixing some usb declaration mismatch
-# Author: Michael 'Mickey' Lauermic...@vanille-media.de
-# Date: Thu Jan 29 16:52:21 2009 +
-#
-# Acquired from OpenEmbedded
-Upstream-Status: Pending
-
-Index: bluez-4.27/tools/dfutool.c
-===
bluez-4.27.orig/tools/dfutool.c
-+++ bluez-4.27/tools/dfutool.c
-@@ -59,7 +59,7 @@
- #endif
-
- #ifdef NEED_USB_GET_BUSSES
--static inline struct usb_bus *usb_get_busses(void)
-+inline struct usb_bus *usb_get_busses(void)
- {
-return usb_busses;
- }
diff --git
a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
deleted file mode 100644
index e8a58e5..000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# Signed-off-by: Khem Rajraj.k...@gmail.com
-#
-# Use the new usb1 API for usb_init() and check for fails from
-# usb_init (). Currently we see a crash on a system which does
-# not have USB because usb_init() fails and it cleans up all initialized
-# data (e.g. ctx) which is used in subsequent calls to libusb
-# We return immediately if usb_init() fails for some reason.
-
-Upstream-Status: Inappropriate [not used]
-
-Index: bluez-4.24/tools/hid2hci.c
-===
bluez-4.24.orig/tools/hid2hci.c2008-10-25 23:40:34.0 -0700
-+++ bluez-4.24/tools/hid2hci.c2008-12-29 22:06:04.0 -0800
-@@ -337,7 +337,7 @@
- int main(int argc, char *argv[])
- {
-struct device_info dev[16];
--int i, opt, num, quiet = 0, mode = HCI;
-+int i, ret, opt, num, quiet = 0, mode = HCI;
-
-while ((opt = getopt_long(argc, argv, +01qh, main_options, NULL)) !=
-1) {
-switch (opt) {
-@@ -361,8 +361,9 @@
-argc -= optind;
-argv += optind;
-optind = 0;
--
--usb_init();
-+ret = libusb_init();
-+if (ret 0)
-+return ret;
-
-num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
-if (num= 0) {
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
deleted file mode 100644
index 881cb9c..000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Acquired from OpenEmbedded
-Upstream-Status: Inappropriate [embedded specific]
-
bluez/sbc/sbc_math.h~2008-03-05 20:18:03.0 +
-+++ bluez/sbc/sbc_math.h2008-10-27 13:39:27.0 +
-@@ -59,7 +59,7 @@
-
- #define SBC_FIXED_0(val) { val = 0; }
- #define MUL(a, b)((a) * (b))
--#ifdef __arm__
-+#if defined(__arm__) !defined(__thumb__)
- #define MULA(a, b, res) ({\
-int tmp = res;\
-__asm__(\
Re: [OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
Saul Wold wrote on 2011-08-16: On 08/12/2011 01:04 AM, Noor, Ahsan wrote: From: Noor Ahsannoor_ah...@mentor.com * Added new recipe 4.96 and removed 4.82 version and its files. Signed-off-by: Noor Ahsannoor_ah...@mentor.com Merged into OE-Core The patch causes a failure: NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed I reported http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this. Thanks, -- Dexuan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
On Tue, Aug 16, 2011 at 10:40:38AM +0800, Cui, Dexuan wrote: Saul Wold wrote on 2011-08-16: On 08/12/2011 01:04 AM, Noor, Ahsan wrote: From: Noor Ahsannoor_ah...@mentor.com * Added new recipe 4.96 and removed 4.82 version and its files. Signed-off-by: Noor Ahsannoor_ah...@mentor.com Merged into OE-Core The patch causes a failure: NOTE: package bluez-hcidump-2.0-r0: task do_compile: Failed I reported http://bugzilla.pokylinux.org/show_bug.cgi?id=1371 for this. You need patch from this commit http://git.openembedded.org/cgit.cgi/meta-openembedded/commit/?id=852ac4b589adb186191ad70a2fa3472d5b351ec4 or upgrade to 2.1 Regards, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
From: Noor Ahsan noor_ah...@mentor.com
* Added new recipe 4.96 and removed 4.82 version and its files.
Signed-off-by: Noor Ahsan noor_ah...@mentor.com
---
.../bluez/bluez4-4.82/bluetooth.conf | 16
.../fix-dfutool-usb-declaration-mismatch.patch | 20 -
.../bluez/bluez4-4.82/hid2hci_usb_init.patch | 35 -
.../bluez/bluez4-4.82/sbc-thumb.patch | 14
.../bluez/bluez4-4.96/bluetooth.conf | 16
meta/recipes-connectivity/bluez/bluez4_4.82.bb | 75
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 73 +++
7 files changed, 89 insertions(+), 160 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
deleted file mode 100644
index ca5e9e4..000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-!-- This configuration file specifies the required security policies
- for Bluetooth core daemon to work. --
-
-!DOCTYPE busconfig PUBLIC -//freedesktop//DTD D-BUS Bus Configuration
1.0//EN
- http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd;
-busconfig
-
- !-- ../system.conf have denied everything, so we just punch some holes --
-
- policy context=default
-allow own=org.bluez/
-allow send_destination=org.bluez/
-allow send_interface=org.bluez.Agent/
- /policy
-
-/busconfig
diff --git
a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
deleted file mode 100644
index 27dead0..000
---
a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# bluez4: add compile patch fixing some usb declaration mismatch
-# Author: Michael 'Mickey' Lauer mic...@vanille-media.de
-# Date: Thu Jan 29 16:52:21 2009 +
-#
-# Acquired from OpenEmbedded
-Upstream-Status: Pending
-
-Index: bluez-4.27/tools/dfutool.c
-===
bluez-4.27.orig/tools/dfutool.c
-+++ bluez-4.27/tools/dfutool.c
-@@ -59,7 +59,7 @@
- #endif
-
- #ifdef NEED_USB_GET_BUSSES
--static inline struct usb_bus *usb_get_busses(void)
-+inline struct usb_bus *usb_get_busses(void)
- {
- return usb_busses;
- }
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
deleted file mode 100644
index e8a58e5..000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# Signed-off-by: Khem Raj raj.k...@gmail.com
-#
-# Use the new usb1 API for usb_init() and check for fails from
-# usb_init (). Currently we see a crash on a system which does
-# not have USB because usb_init() fails and it cleans up all initialized
-# data (e.g. ctx) which is used in subsequent calls to libusb
-# We return immediately if usb_init() fails for some reason.
-
-Upstream-Status: Inappropriate [not used]
-
-Index: bluez-4.24/tools/hid2hci.c
-===
bluez-4.24.orig/tools/hid2hci.c2008-10-25 23:40:34.0 -0700
-+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.0 -0800
-@@ -337,7 +337,7 @@
- int main(int argc, char *argv[])
- {
- struct device_info dev[16];
-- int i, opt, num, quiet = 0, mode = HCI;
-+ int i, ret, opt, num, quiet = 0, mode = HCI;
-
- while ((opt = getopt_long(argc, argv, +01qh, main_options, NULL)) !=
-1) {
- switch (opt) {
-@@ -361,8 +361,9 @@
- argc -= optind;
- argv += optind;
- optind = 0;
--
-- usb_init();
-+ ret = libusb_init();
-+ if (ret 0)
-+ return ret;
-
- num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
- if (num = 0) {
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
deleted file mode 100644
index 881cb9c..000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Acquired from OpenEmbedded
-Upstream-Status: Inappropriate [embedded specific]
-
bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.0 +
-+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.0 +
-@@ -59,7 +59,7 @@
-
- #define SBC_FIXED_0(val) { val = 0; }
- #define MUL(a, b)((a) * (b))
--#ifdef __arm__
-+#if defined(__arm__) !defined(__thumb__)
- #define MULA(a, b, res) ({\
- int tmp = res; \
- __asm__(\
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf
new file mode
