aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/opie-alarm
diff options
context:
space:
mode:
authorPaul Eggleton <bluelightning@bluelightning.org>2009-12-27 05:00:26 +0000
committerPaul Eggleton <bluelightning@bluelightning.org>2010-10-19 00:46:43 +0100
commite133b6e71fc3d08727749cc92a5ed37bbece4353 (patch)
tree314098c8d89ce962aea636f31be24f86d84eee86 /recipes/opie-alarm
parent463a4f992db344a39861bd67600e79e30fe41b18 (diff)
downloadopenembedded-e133b6e71fc3d08727749cc92a5ed37bbece4353.tar.gz
Build development versions of Opie from git instead of CVS.
Note that this change requires a version of BitBake with the "git subpath" patch applied. Signed-off-by: Paul Eggleton <bluelightning@bluelightning.org>
Diffstat (limited to 'recipes/opie-alarm')
-rw-r--r--recipes/opie-alarm/opie-alarm/dirdefines-2.patch19
-rw-r--r--recipes/opie-alarm/opie-alarm_cvs.bb8
2 files changed, 23 insertions, 4 deletions
diff --git a/recipes/opie-alarm/opie-alarm/dirdefines-2.patch b/recipes/opie-alarm/opie-alarm/dirdefines-2.patch
new file mode 100644
index 0000000000..c457941f84
--- /dev/null
+++ b/recipes/opie-alarm/opie-alarm/dirdefines-2.patch
@@ -0,0 +1,19 @@
+--- opiealarm/opiealarm.c
++++ opiealarm/opiealarm.c
+@@ -394,13 +394,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;
diff --git a/recipes/opie-alarm/opie-alarm_cvs.bb b/recipes/opie-alarm/opie-alarm_cvs.bb
index 3b00444153..6f60f4cc61 100644
--- a/recipes/opie-alarm/opie-alarm_cvs.bb
+++ b/recipes/opie-alarm/opie-alarm_cvs.bb
@@ -1,8 +1,8 @@
require ${PN}.inc
-PV = "${OPIE_CVS_PV}"
-PR = "r3"
+PV = "${OPIE_GIT_PV}"
+PR = "r4"
-SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
+SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/opiealarm \
file://01opiealarm \
- file://dirdefines.patch "
+ file://dirdefines-2.patch "