[oe-commits] org.oe.dev merge of 'c89f8d947c6b86b58fd1337e27c43626e0c7ee3d'

[thesing commit]

merge of 'c89f8d947c6b86b58fd1337e27c43626e0c7ee3d'
     and 'e2e070bd3687d84d8c7897c67ef530276f7c443b'

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: c0f36dc5d04e2e5394903a4adce4023e9406e23e
ViewMTN: http://monotone.openembedded.org/revision/info/c0f36dc5d04e2e5394903a4adce4023e9406e23e
Files:
1
packages/linux/linux-rp_2.6.24.bb
packages/libopieobex/files
packages/libopieobex/files/disable-bt-check.patch
packages/libopieobex/libopieobex0_1.2.3.bb
packages/libopieobex/libopieobex0_cvs.bb
packages/tasks/task-opie-all.bb
Diffs:

#
# mt diff -rc89f8d947c6b86b58fd1337e27c43626e0c7ee3d -rc0f36dc5d04e2e5394903a4adce4023e9406e23e
#
#
#
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [57db448f20e39546eebbc6770507fc68be79e571]
#    to [e4a4aabc3012812e10c0db59477c0588e77a0d80]
#
============================================================
--- packages/linux/linux-rp_2.6.24.bb	57db448f20e39546eebbc6770507fc68be79e571
+++ packages/linux/linux-rp_2.6.24.bb	e4a4aabc3012812e10c0db59477c0588e77a0d80
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r8"
+PR = "r9"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
@@ -100,7 +100,7 @@ SRC_URI_append_collie = "\
 	${TKSRC}/linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
 	${TKSRC}/sa1100_spinlock.patch;patch=1 \
 	${TKSRC}/sa1100-dma.patch;patch=1 \
-	${TKSRC}/sa1100_udc_g_ether.patch;patch=1 \
+	${TKSRC}/sa1100_udc_g_ether-2.patch;patch=1 \
 "
 
 SRC_URI_append_poodle = "\


#
# mt diff -re2e070bd3687d84d8c7897c67ef530276f7c443b -rc0f36dc5d04e2e5394903a4adce4023e9406e23e
#
#
#
# add_dir "packages/libopieobex/files"
# 
# add_file "packages/libopieobex/files/disable-bt-check.patch"
#  content [4531ca6db356b9e34c43ab4986901f13cbef2ad4]
# 
# patch "packages/libopieobex/libopieobex0_1.2.3.bb"
#  from [d78020e74a92f741a163fff78e554f93bd96f91e]
#    to [0c803763dbf3b86af956d5c0b3d2520ece6bcc8c]
# 
# patch "packages/libopieobex/libopieobex0_cvs.bb"
#  from [0e5adb40de222cf5c66a7884fa46c00160d179a7]
#    to [8f777b6cc6d58e21975d108a806c55a81f01f4a4]
# 
# patch "packages/tasks/task-opie-all.bb"
#  from [15c14539dc8f8cae41b6fac4fa108dce9012a130]
#    to [247d329aa6a21cecb1f4f74f1a838072b8aa22d8]
#
============================================================
--- packages/libopieobex/files/disable-bt-check.patch	4531ca6db356b9e34c43ab4986901f13cbef2ad4
+++ packages/libopieobex/files/disable-bt-check.patch	4531ca6db356b9e34c43ab4986901f13cbef2ad4
@@ -0,0 +1,19 @@
+--- obex/obex.pro	2007-07-20 23:44:06.000000000 +1200
++++ obex/obex.pro	2007-10-18 17:57:15.000000000 +1300
+@@ -13,12 +13,12 @@
+ 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
+ SOURCES     += btobex.cpp
+ INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
+ LIBS        += -lopietooth1 -lbluetooth
+ DEFINES     += BLUETOOTH
+-}
++#}
============================================================
--- packages/libopieobex/libopieobex0_1.2.3.bb	d78020e74a92f741a163fff78e554f93bd96f91e
+++ packages/libopieobex/libopieobex0_1.2.3.bb	0c803763dbf3b86af956d5c0b3d2520ece6bcc8c
@@ -1,5 +1,6 @@ require libopieobex0.inc
 require libopieobex0.inc
+PR = "r1"
 
-
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/obex \
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
+           file://disable-bt-check.patch;patch=1"
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/pics      "
============================================================
--- packages/libopieobex/libopieobex0_cvs.bb	0e5adb40de222cf5c66a7884fa46c00160d179a7
+++ packages/libopieobex/libopieobex0_cvs.bb	8f777b6cc6d58e21975d108a806c55a81f01f4a4
@@ -1,6 +1,7 @@ PV = "${OPIE_CVS_PV}"
 require libopieobex0.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/obex \
+           ${HANDHELDS_CVS};module=opie/pics \
+           file://disable-bt-check.patch;patch=1"
-           ${HANDHELDS_CVS};module=opie/pics"
============================================================
--- packages/tasks/task-opie-all.bb	15c14539dc8f8cae41b6fac4fa108dce9012a130
+++ packages/tasks/task-opie-all.bb	247d329aa6a21cecb1f4f74f1a838072b8aa22d8
@@ -24,7 +24,7 @@ RDEPENDS_task-opie-applets = "opie-about
                      opie-screenshotapplet opie-suspendapplet opie-vmemo \
                      opie-volumeapplet opie-vtapplet opie-zkbapplet \
                      "
-RDEPENDS_task-opie-inputmethods = "opie-dasher opie-dvorak opie-handwriting \
+RDEPENDS_task-opie-inputmethods = "opie-dvorak opie-handwriting \
                           opie-handwriting-classicset opie-jumpx opie-keyboard \
                           opie-keyview opie-kjumpx opie-multikey opie-unikeyboard"