summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-26 17:44:30 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-05-26 17:44:30 +0000
commitbda4503b99e409a70d538c3883d067e58f129a4a (patch)
treea6578483e4dc9a02cac388753362f865779619c5
parent11243390453ac643a26d4f9089af4ab89f263904 (diff)
parent7f8090999bf4f28a686442e76f1c8131151c3e25 (diff)
merge of '73e0f6af6af847cc3dd891302ac04b9cab7c2470'
and 'c35bb4255861a806a262b725cb19d12b4c906286'
-rw-r--r--packages/libqpe/libqpe-opie/fix-sd-card-path.patch17
-rw-r--r--packages/libqpe/libqpe-opie_1.2.3.bb3
2 files changed, 19 insertions, 1 deletions
diff --git a/packages/libqpe/libqpe-opie/fix-sd-card-path.patch b/packages/libqpe/libqpe-opie/fix-sd-card-path.patch
new file mode 100644
index 0000000000..32be5d2e7c
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/fix-sd-card-path.patch
@@ -0,0 +1,17 @@
+Index: library/storage.cpp
+===================================================================
+RCS file: /cvs/opie/library/storage.cpp,v
+retrieving revision 1.25
+retrieving revision 1.26
+diff -U3 -r1.25 -r1.26
+--- library/storage.cpp 7 Mar 2005 14:32:58 -0000 1.25
++++ library/storage.cpp 29 Dec 2007 02:14:09 -0000 1.26
+@@ -307,7 +307,7 @@
+ bool hasMmc=false;
+ if( deviceTab("/dev/mmc/part"))
+ hasMmc=true;
+- if( deviceTab("/dev/mmcd"))
++ else if( deviceTab("/dev/mmcblk"))
+ hasMmc=true;
+ return hasMmc;
+ }
diff --git a/packages/libqpe/libqpe-opie_1.2.3.bb b/packages/libqpe/libqpe-opie_1.2.3.bb
index 00f9819f6e..a51d6a9225 100644
--- a/packages/libqpe/libqpe-opie_1.2.3.bb
+++ b/packages/libqpe/libqpe-opie_1.2.3.bb
@@ -1,11 +1,12 @@
require ${PN}.inc
-PR = "r1"
+PR = "r2"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
file://fix-titleheight.patch;patch=1 \
file://unbreak-logging.patch;patch=1 \
file://citytime-path.patch;patch=1 \
+ file://fix-sd-card-path.patch;patch=1 \
"