[maemo-commits] [maemo-commits] r17547 - in projects/haf/trunk/ke-recv: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-03-02 09:24:52 +0200 (Mon, 02 Mar 2009)
New Revision: 17547

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/debian/control
   projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh
   projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh
   projects/haf/trunk/ke-recv/src/pcsuite-enable.sh
Log:
releasing


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-03-02 07:10:27 UTC (rev 17546)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-03-02 07:24:52 UTC (rev 17547)
@@ -1,4 +1,4 @@
-ke-recv (3.9-1~unreleased) unstable; urgency=low
+ke-recv (3.9-1) unstable; urgency=low
 
   * Fixed some minor Coverity-found issues.
   * Now installing /etc/event.d/ke-recv Upstart script. Fixes: NB#101496
@@ -27,7 +27,7 @@
   * Verified that bug 100593 is not reproducable. Fixes: NB#100593
   * Added 'rodir' to mount options. Fixes: NB#101324
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 24 Feb 2009 08:25:34 +0200
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 02 Mar 2009 08:33:32 +0200
 
 ke-recv (3.8-1) unstable; urgency=low
 

Modified: projects/haf/trunk/ke-recv/debian/control
===================================================================
--- projects/haf/trunk/ke-recv/debian/control	2009-03-02 07:10:27 UTC (rev 17546)
+++ projects/haf/trunk/ke-recv/debian/control	2009-03-02 07:24:52 UTC (rev 17547)
@@ -7,7 +7,7 @@
 
 Package: ke-recv
 Architecture: any
-Depends: ${shlibs:Depends}, ke-recv-l10n-mr | ke-recv-l10n-mr0, gconf2, osso-af-startup (>= 1.22), hal, dosfstools (>> 3.0.1-1maemo1), mtools
+Depends: ${shlibs:Depends}, ke-recv-l10n-mr | ke-recv-l10n-mr0, gconf2, osso-af-startup (>= 1.22), hal, dosfstools (>= 3.0.1-1maemo2), mtools
 Description: Program for automatical mounting and unmounting of memory cards.
  Program for receiving HW events from the HAL, managing mounting, renaming,
  formatting, and partitioning of memory cards, etc.

Modified: projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh	2009-03-02 07:10:27 UTC (rev 17546)
+++ projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh	2009-03-02 07:24:52 UTC (rev 17547)
@@ -45,6 +45,8 @@
   mkdir -p $MP
 fi
 
+# TODO: check the FAT magic number
+
 /sbin/dosfsck -T 10 $PDEV
 if [ $? != 0 ]; then
   echo "$0: $PDEV is corrupt, trying to mount it read-only"

Modified: projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh	2009-03-02 07:10:27 UTC (rev 17546)
+++ projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh	2009-03-02 07:24:52 UTC (rev 17547)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This file is part of ke-recv
 #
-# Copyright (C) 2004-2008 Nokia Corporation. All rights reserved.
+# Copyright (C) 2004-2009 Nokia Corporation. All rights reserved.
 #
 # Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 #
@@ -23,10 +23,29 @@
 
 /sbin/lsmod | grep g_nokia > /dev/null
 if [ $? = 0 ]; then
-    echo "$0: removing g_nokia"
+    logger "$0: removing g_nokia"
 
     initctl emit G_NOKIA_REMOVE
 
+    PNATD_PID=`pidof pnatd`
+    if [ $? = 0 ]; then
+        kill $PNATD_PID
+    else
+        logger "$0: pnatd is not running"
+    fi
+    OBEXD_PID=`pidof obexd`
+    if [ $? = 0 ]; then
+        kill $OBEXD_PID
+    else
+        logger "$0: obexd is not running"
+    fi
+    SYNCD_PID=`pidof syncd`
+    if [ $? = 0 ]; then
+        kill $SYNCD_PID
+    else
+        logger "$0: syncd is not running"
+    fi
+
     sleep 1
     /sbin/rmmod g_nokia
 fi
@@ -38,7 +57,7 @@
 fi
 
 if [ $RC != 0 ]; then
-    echo "$0: failed to install g_file_storage"
+    logger "$0: failed to install g_file_storage"
     exit 1
 fi
 
@@ -62,7 +81,7 @@
         FOUND=1
     fi
     if [ $FOUND = 1 ]; then
-        echo "$0: $1 is already USB-shared"
+        logger "$0: $1 is already USB-shared"
         exit 0
     fi
 fi

Modified: projects/haf/trunk/ke-recv/src/pcsuite-enable.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/pcsuite-enable.sh	2009-03-02 07:10:27 UTC (rev 17546)
+++ projects/haf/trunk/ke-recv/src/pcsuite-enable.sh	2009-03-02 07:24:52 UTC (rev 17547)
@@ -21,7 +21,7 @@
 
 /sbin/lsmod | grep g_file_storage > /dev/null
 if [ $? = 0 ]; then
-    echo "$0: removing g_file_storage"
+    logger "$0: removing g_file_storage"
     initctl emit G_FILE_STORAGE_REMOVE
     /sbin/rmmod g_file_storage
 fi
@@ -33,7 +33,7 @@
 fi
 
 if [ $RC != 0 ]; then
-    echo "$0: failed to install g_nokia"
+    logger "$0: failed to install g_nokia"
     exit 1
 else
     # TODO: remove the sleep when the wait is in place
@@ -42,4 +42,23 @@
 
 initctl emit --no-wait G_NOKIA_READY
 
+# TODO: wait for the devices
+
+OBEXD_PID=`pidof obexd`
+if [ $? != 0 ]; then
+    logger "$0: obexd is not running"
+else
+    kill -USR1 $OBEXD_PID
+    logger "$0: sent SIGUSR1 to obexd"
+fi
+
+SYNCD_PID=`pidof syncd`
+if [ $? != 0 ]; then
+    logger "$0: failed to get syncd's PID"
+    exit 1
+fi
+
+kill -USR1 $SYNCD_PID
+logger "$0: sent SIGUSR1 to syncd"
+
 exit 0