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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-01-09 17:22:44 +0200 (Fri, 09 Jan 2009)
New Revision: 17080

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/src/events.c
   projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh
   projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh
Log:
making a release


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-01-09 13:46:43 UTC (rev 17079)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-01-09 15:22:44 UTC (rev 17080)
@@ -1,14 +1,16 @@
-ke-recv (3.5-1~unreleased) unstable; urgency=low
+ke-recv (3.5-1) unstable; urgency=low
 
   * Fourth partition is now FAT (fallback is the first partition).
-    Fixes: NB#93522
+    Fixes: NB#93522, NB#93525
   * Send TERM to pnatd before trying to remove g_nokia. Fixes: NB#93864
+  * Send TERM to obexd and syncd as well.
   * Updated the unofficial partitioning script for internal memory card.
   * Fixed ke-recv-test to provide correct device parameters for rename,
     format and repair messages.
   * Use 128 sectors per cluster when formatting. Fixes: NB#93517
+  * Disable Gabe's fallback code from osso-mmc-mount.sh, it needs some fixing.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 16 Dec 2008 14:26:56 +0200
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 09 Jan 2009 17:22:05 +0200
 
 ke-recv (3.4-1) unstable; urgency=low
 

Modified: projects/haf/trunk/ke-recv/src/events.c
===================================================================
--- projects/haf/trunk/ke-recv/src/events.c	2009-01-09 13:46:43 UTC (rev 17079)
+++ projects/haf/trunk/ke-recv/src/events.c	2009-01-09 15:22:44 UTC (rev 17080)
@@ -574,7 +574,14 @@
                 if (vol == NULL) {
                         ULOG_ERR_F("volume %d not found from %s",
                                    mmc->preferred_volume, mmc->name);
-                        return;
+                        if (mmc->preferred_volume != 1) {
+                                /* workaround for not yet partitioned systems */
+                                ULOG_DEBUG_F("falling back to partition 1!");
+                                vol = get_nth_volume(mmc, 1);
+                                if (vol == NULL || vol->dev_name == NULL)
+                                        return;
+                        } else
+                                return;
                 }
                 dev = vol->dev_name;
         } else

Modified: projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh	2009-01-09 13:46:43 UTC (rev 17079)
+++ projects/haf/trunk/ke-recv/src/osso-mmc-mount.sh	2009-01-09 15:22:44 UTC (rev 17080)
@@ -47,7 +47,8 @@
 
 mmc-mount $PDEV $MP
 RC=$?
-if [ $RC != 0 ]; then
+#if [ $RC != 0 ]; then
+if false; then
 
   # Let's try ext3 - need to load modules
   KERNEL_VERSION=`uname -r`

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-01-09 13:46:43 UTC (rev 17079)
+++ projects/haf/trunk/ke-recv/src/osso-usb-mass-storage-enable.sh	2009-01-09 15:22:44 UTC (rev 17080)
@@ -27,12 +27,23 @@
 
     PNATD_PID=`pidof pnatd`
     if [ $? = 0 ]; then
-        # kill pnatd to make it release its grip on g_nokia
         kill $PNATD_PID
-        sleep 1
     else
         echo "$0: pnatd is not running"
     fi
+    OBEXD_PID=`pidof obexd`
+    if [ $? = 0 ]; then
+        kill $OBEXD_PID
+    else
+        echo "$0: obexd is not running"
+    fi
+    SYNCD_PID=`pidof syncd`
+    if [ $? = 0 ]; then
+        kill $SYNCD_PID
+    else
+        echo "$0: syncd is not running"
+    fi
+    sleep 1
     /sbin/rmmod g_nokia
 fi