navit: Update .inc, include navit.launcher to enable the low-mem workaround on-demand.

diff --git a/packages/navit/files/navit.launcher b/packages/navit/files/navit.launcher
new file mode 100644 (file)
index 0000000..b95aadb
--- /dev/null
+++ b/packages/navit/files/navit.launcher
@@ -0,0 +1,30 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: navit.launcher
+# Date: 20080105 (YMD)
+#
+#################################################################################
+#
+# 20080105 - v0.0.1    - Initial release
+
+# On devices with low memory (< 512Mb?) Navit will segfault on start.
+# This can be worked around by doing
+# "echo 1 > /proc/sys/vm/overcommit_memory"
+
+if test "`cat /proc/meminfo | grep ^MemTotal | awk '{print $2}'`" -lt "500000"
+then
+       if test "$USER" = "root"
+       then
+               echo "Enabling low-mem workaround..."
+               echo 1 > /proc/sys/vm/overcommit_memory
+       else
+               echo "I need root-privs to enable the low-mem workaround!"
+       fi
+fi
+
+navit.real $*
+       
+

diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc
index 3754e15..1d68027 100644 (file)
--- a/packages/navit/navit.inc
+++ b/packages/navit/navit.inc
@@ -9,3 +9,17 @@ PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 
 FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
 FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
+
+SRC_URI_append = " \
+                 file://navit.launcher \
+                "
+
+do_install_append() {
+       install -d ${D}/usr/share/applications/
+       
+       install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
+       
+       mv ${D}/usr/bin/navit ${D}/usr/bin/navit.real
+       
+       install -m 0755 ${WORKDIR}/navit.launcher ${D}/usr/bin/navit
+}

diff --git a/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb
index efb78e9..7fdb491 100644 (file)
--- a/packages/navit/navit_0.0.3.bb
+++ b/packages/navit/navit_0.0.3.bb
@@ -1,6 +1,6 @@
 require navit.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
           file://navit.xml-so.patch;patch=1 \

diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb
index 30bc778..0f95833 100644 (file)
--- a/packages/navit/navit_cvs.bb
+++ b/packages/navit/navit_cvs.bb
@@ -1,7 +1,7 @@
 require navit.inc
 
 PV = "0.0.3+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/navit"
 
@@ -13,8 +13,3 @@ EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap -
 
 EXTRA_AUTORECONF = " -I m4"
 
-do_install_append() {
-       install -d ${D}/usr/share/applications/
-       
-       install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
-}