diff options
| -rw-r--r-- | meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch | 23 | ||||
| -rw-r--r-- | meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend | 7 |
2 files changed, 0 insertions, 30 deletions
diff --git a/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch deleted file mode 100644 index ba2f33c62..000000000 --- a/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5/0001_fix_compile_issue_when_using_in_c++.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -urN bluez-5.22.orig/lib/bluetooth.h bluez-5.22/lib/bluetooth.h ---- bluez-5.22.orig/lib/bluetooth.h 2013-12-10 15:59:06.000000000 +0900 -+++ bluez-5.22/lib/bluetooth.h 2015-10-28 13:34:25.749335768 +0900 -@@ -158,16 +158,16 @@ - #define bt_get_unaligned(ptr) \ - ({ \ - struct __attribute__((packed)) { \ -- typeof(*(ptr)) __v; \ -- } *__p = (typeof(__p)) (ptr); \ -+ __typeof__(*(ptr)) __v; \ -+ } *__p = (__typeof__(__p)) (ptr); \ - __p->__v; \ - }) - - #define bt_put_unaligned(val, ptr) \ - do { \ - struct __attribute__((packed)) { \ -- typeof(*(ptr)) __v; \ -- } *__p = (typeof(__p)) (ptr); \ -+ __typeof__(*(ptr)) __v; \ -+ } *__p = (__typeof__(__p)) (ptr); \ - __p->__v = (val); \ - } while(0) diff --git a/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend index 9c49ad0e9..1ab375645 100644 --- a/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-agl-profile-core/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -1,13 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_append = " file://bluetooth.conf" -APPLY_v522 = "${@str('no' if '${PV}' != '5.22' else 'yes')}" - -SRC_URI_append = "\ - file://0001_fix_compile_issue_when_using_in_c++.patch;apply=${APPLY_v522} \ -" - - do_install_append() { install -m 0644 ${WORKDIR}/bluetooth.conf ${D}${sysconfdir}/dbus-1/system.d/bluetooth.conf |