[oe-commits] org.oe.dev merge of '73e0f6af6af847cc3dd891302ac04b9cab7c2470'

[oe commit]

merge of '73e0f6af6af847cc3dd891302ac04b9cab7c2470'
     and 'c35bb4255861a806a262b725cb19d12b4c906286'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 564f73ef46c0b4c0b3eb9e0dbc77d7509d847231
ViewMTN: http://monotone.openembedded.org/revision/info/564f73ef46c0b4c0b3eb9e0dbc77d7509d847231
Files:
1
packages/libqpe/libqpe-opie/fix-sd-card-path.patch
packages/libqpe/libqpe-opie_1.2.3.bb
packages/eglibc/eglibc-stage.inc
Diffs:

#
# mt diff -r73e0f6af6af847cc3dd891302ac04b9cab7c2470 -r564f73ef46c0b4c0b3eb9e0dbc77d7509d847231
#
#
#
# add_file "packages/libqpe/libqpe-opie/fix-sd-card-path.patch"
#  content [286bc1a1b8b869d1c408efaf25d0799d8177ef37]
# 
# patch "packages/libqpe/libqpe-opie_1.2.3.bb"
#  from [8c32d00717f267664f0048b023897704ed2bb6b3]
#    to [e1f62cd8a04ab15a45006ed051ef1ad1e05c9f1f]
#
============================================================
--- packages/libqpe/libqpe-opie/fix-sd-card-path.patch	286bc1a1b8b869d1c408efaf25d0799d8177ef37
+++ packages/libqpe/libqpe-opie/fix-sd-card-path.patch	286bc1a1b8b869d1c408efaf25d0799d8177ef37
@@ -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;
+ }
============================================================
--- packages/libqpe/libqpe-opie_1.2.3.bb	8c32d00717f267664f0048b023897704ed2bb6b3
+++ packages/libqpe/libqpe-opie_1.2.3.bb	e1f62cd8a04ab15a45006ed051ef1ad1e05c9f1f
@@ -1,11 +1,12 @@ require ${PN}.inc
 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 \
           "
 


#
# mt diff -rc35bb4255861a806a262b725cb19d12b4c906286 -r564f73ef46c0b4c0b3eb9e0dbc77d7509d847231
#
#
#
# patch "packages/eglibc/eglibc-stage.inc"
#  from [4cabc49eb0552ed4b7a83649bacd02dec1d6307c]
#    to [9add53332fea43aff1a7efdeba79858facecfc1a]
#
============================================================
--- packages/eglibc/eglibc-stage.inc	4cabc49eb0552ed4b7a83649bacd02dec1d6307c
+++ packages/eglibc/eglibc-stage.inc	9add53332fea43aff1a7efdeba79858facecfc1a
@@ -3,7 +3,7 @@ do_stage() {
 	oe_runmake 'install_root=${STAGING_DIR_HOST}' \
 		   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
 		   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
-		   install-headers install-lib install
+		   install
 
 	install -d ${STAGING_INCDIR}/gnu \
 		   ${STAGING_INCDIR}/bits \
@@ -15,7 +15,4 @@ do_stage() {
 		h=`echo $r|sed -e's,\.x$,.h,'`
 		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
 	done
-	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
-	done
 }