From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Tue, 24 Nov 2009 12:02:49 +0000 (+0100)
Subject: navit: Do not set /proc/sys/vm/overcommit in an app launcher, especially not without... 
X-Git-Tag: Release-2010-05/1~1637
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f0f2940bfacb21cff083f4cbf527fdd9de0005b;p=openembedded.git

navit: Do not set /proc/sys/vm/overcommit in an app launcher, especially not without ever changing it back.

* This reverts parts of 742fb4ae71e6a7e655385086ba9edebbf00b6ebd
* If someone wants to do use this, it should be done on a more finegrained distro basis

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
---

diff --git a/recipes/navit/files/navit.launcher b/recipes/navit/files/navit.launcher
deleted file mode 100644
index b95aadb878..0000000000
--- a/recipes/navit/files/navit.launcher
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /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/recipes/navit/navit.inc b/recipes/navit/navit.inc
index 8ad439df2a..fa250ffac9 100644
--- a/recipes/navit/navit.inc
+++ b/recipes/navit/navit.inc
@@ -15,7 +15,6 @@ FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
 
 SRC_URI_append = " \
                   file://navit.desktop \
-                  file://navit.launcher \
                   file://navit.png \
 	  	 "
 
@@ -25,8 +24,5 @@ do_install_append() {
         install -d ${D}${datadir}/pixmaps/
         install -m 0644 ${WORKDIR}/navit.png ${D}${datadir}/pixmaps/
 
-        mv ${D}${bindir}/navit ${D}${bindir}/navit.real
-        install -m 0755 ${WORKDIR}/navit.launcher ${D}${bindir}/navit
-
 	rm ${D}${libdir}/${PN}/*/*.la
 }