aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-17 14:57:01 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-17 14:43:22 +0100
commit963ac303ee49fd77d32d1edaaebf0358af4a6fd0 (patch)
treee6772c2d486d6df18d3bc566c7f224882ea1de7a
parentdf881400d4593e68d076ee9e7560eba99d95b09b (diff)
downloadmeta-opie-963ac303ee49fd77d32d1edaaebf0358af4a6fd0.tar.gz
meta-opie-963ac303ee49fd77d32d1edaaebf0358af4a6fd0.tar.bz2
meta-opie-963ac303ee49fd77d32d1edaaebf0358af4a6fd0.zip
libopieobex0: fix disable-bit-check patch for current git
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-opie/libopieobex/files/disable-bt-check-git.patch18
-rw-r--r--recipes-opie/libopieobex/libopieobex0_git.bb4
2 files changed, 20 insertions, 2 deletions
diff --git a/recipes-opie/libopieobex/files/disable-bt-check-git.patch b/recipes-opie/libopieobex/files/disable-bt-check-git.patch
new file mode 100644
index 0000000..c8d0b7d
--- /dev/null
+++ b/recipes-opie/libopieobex/files/disable-bt-check-git.patch
@@ -0,0 +1,18 @@
+--- obex/obex.pro
++++ obex/obex.pro
+@@ -13,11 +13,11 @@ VERSION = 0.0.4
+ include( $(OPIEDIR)/include.pro )
+ target.path = $$prefix/plugins/applets
+
+-#FIXME: These parameters are used if bluetooth is used
+-CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
+-contains( CONFTEST, y ){
++#FIXME: This test does not work under OE. Instead, just always enable bluetooth.
++#CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
++#contains( CONFTEST, y ){
+ HEADERS += btobex.h btobexpush.h
+ SOURCES += btobex.cpp btobexpush.cpp
+ LIBS += -lopiebluez2
+ DEFINES += BLUETOOTH
+-}
++#}
diff --git a/recipes-opie/libopieobex/libopieobex0_git.bb b/recipes-opie/libopieobex/libopieobex0_git.bb
index 318bee6..ad5aad2 100644
--- a/recipes-opie/libopieobex/libopieobex0_git.bb
+++ b/recipes-opie/libopieobex/libopieobex0_git.bb
@@ -1,7 +1,7 @@
require libopieobex0.inc
PV = "${OPIE_GIT_PV}"
-PR = "r8"
+PR = "r9"
SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/obex \
${OPIE_GIT};protocol=git;subpath=pics \
- file://disable-bt-check.patch"
+ file://disable-bt-check-git.patch"