[oe-commits] Michael 'Mickey' Lauer : fso-image: remove autostart of gpsd

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 446e65f825169acde5fb51a8e0117ca3e9b2c3de
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=446e65f825169acde5fb51a8e0117ca3e9b2c3de

Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Fri Jan  2 16:02:45 2009 +0100

fso-image: remove autostart of gpsd

---

 packages/images/fso-image.bb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index 3f72b18..a59460e 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -3,7 +3,7 @@
 #------------------------------------------------------
 
 PV = "1.1"
-PR = "r0"
+PR = "r1"
 
 # no languages for now
 IMAGE_LINGUAS = ""
@@ -80,7 +80,7 @@ ZHONE_INSTALL = "\
 
 # additional apps
 APPS_INSTALL = "\
-  tichy \
+#  tichy \
   gpe-gallery \
   gpe-sketchbook \
   gpe-filemanager \
@@ -128,9 +128,11 @@ fso_rootfs_postprocess() {
     echo 'gtk-icon-theme-name = "Tango"' >> ./etc/gtk-2.0/gtkrc
     # fix strange iconv/gconf bug
     ln -s libc.so.6 ./lib/libc.so
-    # set sensible DNS entries
+    # set sensible default DNS entries
     echo "nameserver 208.67.222.222" > ./etc/resolv.conf
     echo "nameserver 208.67.220.220" >> ./etc/resolv.conf
+    # remove autostart of gspd (if installed), we have fso-gpsd and this conflicts
+    rm -f ./etc/init.d/gpsd
     # back on track
     cd $curdir
 }