[oe-commits] org.oe.dev navit: Update .inc, include navit.launcher to enable the low-mem workaround on-demand.

[coredump2 commit]

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

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 897413a90458757cb227c0afbc74963d175a60a7
ViewMTN: http://monotone.openembedded.org/revision/info/897413a90458757cb227c0afbc74963d175a60a7
Files:
1
packages/navit/files/navit.launcher
packages/navit/navit.inc
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
Diffs:

#
# mt diff -ra7496676105f22f543e3f1970b18350946f1838a -r897413a90458757cb227c0afbc74963d175a60a7
#
# 
# 
# add_file "packages/navit/files/navit.launcher"
#  content [27112f09960b2c81d820fef3fe2b712926754667]
# 
# patch "packages/navit/navit.inc"
#  from [926adcffc6471b5c8bf96d43d6eaf5c81bd2debf]
#    to [dc36e11d9155034cfe2c407959f0b757b5a483de]
# 
# patch "packages/navit/navit_0.0.3.bb"
#  from [bfc46c9ba7af3efe915f63a8e5dac60eb2cc69e0]
#    to [1127602c440a00440088e7587bf88d3c760f05c4]
# 
# patch "packages/navit/navit_cvs.bb"
#  from [537deb351fc223dc40a33d489f2edf10bd7f67dd]
#    to [d22f4f689826ebf7d008a0bc66a88d56cc149e05]
# 
============================================================
--- packages/navit/files/navit.launcher	27112f09960b2c81d820fef3fe2b712926754667
+++ packages/navit/files/navit.launcher	27112f09960b2c81d820fef3fe2b712926754667
@@ -0,0 +1,30 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at 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 $*
+	
+
============================================================
--- packages/navit/navit.inc	926adcffc6471b5c8bf96d43d6eaf5c81bd2debf
+++ packages/navit/navit.inc	dc36e11d9155034cfe2c407959f0b757b5a483de
@@ -9,3 +9,17 @@ FILES_${PN}-dev += "${libdir}/${PN}/*/*.
 
 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
+}
============================================================
--- packages/navit/navit_0.0.3.bb	bfc46c9ba7af3efe915f63a8e5dac60eb2cc69e0
+++ packages/navit/navit_0.0.3.bb	1127602c440a00440088e7587bf88d3c760f05c4
@@ -1,6 +1,6 @@ require navit.inc
 require navit.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
 	   file://navit.xml-so.patch;patch=1 \
============================================================
--- packages/navit/navit_cvs.bb	537deb351fc223dc40a33d489f2edf10bd7f67dd
+++ packages/navit/navit_cvs.bb	d22f4f689826ebf7d008a0bc66a88d56cc149e05
@@ -1,7 +1,7 @@ PV = "0.0.3+cvs${SRCDATE}"
 require navit.inc
 
 PV = "0.0.3+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 S = "${WORKDIR}/navit"
 
@@ -13,8 +13,3 @@ EXTRA_AUTORECONF = " -I m4"
 
 EXTRA_AUTORECONF = " -I m4"
 
-do_install_append() {
-	install -d ${D}/usr/share/applications/
-	
-	install -m 0644 ${WORKDIR}/navit.desktop ${D}/usr/share/applications/
-}