[oe-commits] org.oe.dev opie-alarm: adjust for the new filesystem layout

[polyonymous commit]

opie-alarm: adjust for the new filesystem layout

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: d94ee58fe2a5ed340cb790c594929a578134773d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d94ee58fe2a5ed340cb790c594929a578134773d
Files:
1
packages/opie-alarm/opie-alarm/dirdefines.patch
classes/opie.bbclass
packages/opie-alarm/opie-alarm_cvs.bb
Diffs:

#
# mt diff -rf2cf538e1330097c3562ce813af4b6958ab92581 -rd94ee58fe2a5ed340cb790c594929a578134773d
#
# 
# 
# add_file "packages/opie-alarm/opie-alarm/dirdefines.patch"
#  content [18a87ea43ad331d054fcb78c95f6da867a9c7b2a]
# 
# patch "classes/opie.bbclass"
#  from [441638d80c7d1595e6037940f20b24b8bca48ebd]
#    to [3520a2c069712e9db8ce48af55f65b869bd6b9fd]
# 
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
#  from [aadc0b4fc4280abbdfd3f206d4d8e240fbb48621]
#    to [ab53754a45a99c30cb4df8437d42d73aad9d163e]
# 
============================================================
--- packages/opie-alarm/opie-alarm/dirdefines.patch	18a87ea43ad331d054fcb78c95f6da867a9c7b2a
+++ packages/opie-alarm/opie-alarm/dirdefines.patch	18a87ea43ad331d054fcb78c95f6da867a9c7b2a
@@ -0,0 +1,21 @@
+diff --git a/opiealarm.c b/opiealarm.c
+index 422865c..b948ef2 100644
+--- a/opiealarm.c
++++ b/opiealarm.c
+@@ -367,13 +367,13 @@ int resume ( int resuspend )
+ 				
+ 				setenv ( "LOGNAME", "root", 1 );
+ 				setenv ( "HOME", "/root", 1 );
+-				setenv ( "LD_LIBRARY_PATH", "/opt/QtPalmtop/lib", 1 );
+-				setenv ( "QTDIR", "/opt/QtPalmtop", 1 );
++				setenv ( "LD_LIBRARY_PATH", OPIE_LIBDIR, 1 );
++				setenv ( "QTDIR", OPIE_QTDIR, 1 );
+ 			
+ 				remove_pidfile ( );
+ 			
+ 				// no need for system() since this process is no longer useful anyway				
+-				execv ( "/opt/QtPalmtop/bin/qcop", argv );
++				execv ( OPIE_BINDIR "/qcop", argv );
+ 				
+ 				perror ( "exec for qcop failed" );
+ 				return 5;
============================================================
--- classes/opie.bbclass	441638d80c7d1595e6037940f20b24b8bca48ebd
+++ classes/opie.bbclass	3520a2c069712e9db8ce48af55f65b869bd6b9fd
@@ -21,7 +21,8 @@ DEPENDS_prepend = "${@["libopie2 ", ""][
 
 # to be consistent, put all targets into workdir
 # NOTE: leave one space at the end, other files are expecting that
-EXTRA_QMAKEVARS_POST += "DESTDIR=${S} "
+EXTRA_QMAKEVARS_POST += " DESTDIR=${S} "
+EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
 
 # Opie standard TAG value
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
============================================================
--- packages/opie-alarm/opie-alarm_cvs.bb	aadc0b4fc4280abbdfd3f206d4d8e240fbb48621
+++ packages/opie-alarm/opie-alarm_cvs.bb	ab53754a45a99c30cb4df8437d42d73aad9d163e
@@ -1,7 +1,8 @@ PV = "${OPIE_CVS_PV}"
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r2.1"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
+           file://01opiealarm \
+	   file://dirdefines.patch;patch=1 "
-           file://01opiealarm "