diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-04-10 12:53:36 +0100 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-05-20 22:34:16 +0100 |
commit | 2a84d5e44448f75d5c9b170d19adccf2cf492e0a (patch) | |
tree | fb0c03973625f677732cb80e94277a008017b534 | |
parent | 7573499c10bc54134768fb7f373f95d1c05124d0 (diff) | |
download | meta-opie-2a84d5e44448f75d5c9b170d19adccf2cf492e0a.tar.gz |
opie-alarm: fix git version for upstream changes
The OPIE_BINDIR part of this patch is now upstream so we can remove it
from the git version.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r-- | recipes-opie/opie-alarm/opie-alarm/dirdefines-git.patch | 13 | ||||
-rw-r--r-- | recipes-opie/opie-alarm/opie-alarm_git.bb | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/recipes-opie/opie-alarm/opie-alarm/dirdefines-git.patch b/recipes-opie/opie-alarm/opie-alarm/dirdefines-git.patch new file mode 100644 index 0000000..3338c39 --- /dev/null +++ b/recipes-opie/opie-alarm/opie-alarm/dirdefines-git.patch @@ -0,0 +1,13 @@ +--- opiealarm/opiealarm.c ++++ opiealarm/opiealarm.c +@@ -394,8 +394,8 @@ 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 ( ); + diff --git a/recipes-opie/opie-alarm/opie-alarm_git.bb b/recipes-opie/opie-alarm/opie-alarm_git.bb index 6f60f4c..2482ed4 100644 --- a/recipes-opie/opie-alarm/opie-alarm_git.bb +++ b/recipes-opie/opie-alarm/opie-alarm_git.bb @@ -1,8 +1,8 @@ require ${PN}.inc PV = "${OPIE_GIT_PV}" -PR = "r4" +PR = "r5" SRC_URI = "${OPIE_GIT};protocol=git;subpath=core/opiealarm \ file://01opiealarm \ - file://dirdefines-2.patch " + file://dirdefines-git.patch " |