[maemo-commits] [maemo-commits] r19021 - in projects/haf/tags/ke-recv/3.19-5: debian mmc-utils src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Aug 3 14:41:33 EEST 2009
- Previous message: [maemo-commits] r19020 - projects/haf/tags/ke-recv
- Next message: [maemo-commits] r19022 - projects/haf/tags/ke-recv/3.19-5/src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kihamala Date: 2009-08-03 14:41:13 +0300 (Mon, 03 Aug 2009) New Revision: 19021 Modified: projects/haf/tags/ke-recv/3.19-5/debian/changelog projects/haf/tags/ke-recv/3.19-5/debian/init.d projects/haf/tags/ke-recv/3.19-5/mmc-utils/mmc-pre-unmount.c projects/haf/tags/ke-recv/3.19-5/src/ke-recv.c projects/haf/tags/ke-recv/3.19-5/src/osso-mmc-mount.sh projects/haf/tags/ke-recv/3.19-5/src/pcsuite-enable.sh Log: commit for other testers Modified: projects/haf/tags/ke-recv/3.19-5/debian/changelog =================================================================== --- projects/haf/tags/ke-recv/3.19-5/debian/changelog 2009-08-03 07:39:46 UTC (rev 19020) +++ projects/haf/tags/ke-recv/3.19-5/debian/changelog 2009-08-03 11:41:13 UTC (rev 19021) @@ -1,3 +1,13 @@ +ke-recv (3.19-5) unstable; urgency=low + + * Fixes: NB#114280 - MyDocs gets dated Jan 1 1970 after using USB in mass + storage mode + * Fixes: NB#121472 - mmc-pre-unmount crashes on mass storage mode when + memory is full + * Fixes: NB#123352 - AppCert-USB-Modem query doesn't work after PC reboot + + -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> Mon, 3 Aug 2009 10:39:09 +0300 + ke-recv (3.19-4) unstable; urgency=low * Keep g_file_storage loaded by default instead of g_nokia. Modified: projects/haf/tags/ke-recv/3.19-5/debian/init.d =================================================================== --- projects/haf/tags/ke-recv/3.19-5/debian/init.d 2009-08-03 07:39:46 UTC (rev 19020) +++ projects/haf/tags/ke-recv/3.19-5/debian/init.d 2009-08-03 11:41:13 UTC (rev 19021) @@ -60,14 +60,26 @@ # Start daemons echo -n "Starting $DESC: " - # g_file_storage is loaded as the default - /sbin/modprobe g_file_storage stall=0 luns=2 removable - # check if this is the first boot if [ -e /home/user/first-boot-flag ]; then export FIRST_BOOT=1 fi + # check if this is TA image + if [ -x /usr/bin/sysinfo-tool ]; then + sysinfo-tool -g /device/sw-release-ver | grep -q _TA_ + if [ $? = 0 ]; then + export TA_IMAGE=1 + # modprobe g_nokia automatically in TA images + /usr/sbin/pcsuite-enable.sh + fi + fi + + if [ "x$TA_IMAGE" = "x" ]; then + # g_file_storage is loaded as the default + /sbin/modprobe g_file_storage stall=0 luns=2 removable + fi + if [ -x $DTOOL ]; then $DTOOL -U $USER -n -1 -t $DAEMON else Modified: projects/haf/tags/ke-recv/3.19-5/mmc-utils/mmc-pre-unmount.c =================================================================== --- projects/haf/tags/ke-recv/3.19-5/mmc-utils/mmc-pre-unmount.c 2009-08-03 07:39:46 UTC (rev 19020) +++ projects/haf/tags/ke-recv/3.19-5/mmc-utils/mmc-pre-unmount.c 2009-08-03 11:41:13 UTC (rev 19021) @@ -64,6 +64,9 @@ GList *l; monitor = gnome_vfs_get_volume_monitor (); + if (monitor == NULL) + return 0; + l = gnome_vfs_volume_monitor_get_mounted_volumes (monitor); for (; l != NULL; l = l->next) { GnomeVFSVolume *v; Modified: projects/haf/tags/ke-recv/3.19-5/src/ke-recv.c =================================================================== --- projects/haf/tags/ke-recv/3.19-5/src/ke-recv.c 2009-08-03 07:39:46 UTC (rev 19020) +++ projects/haf/tags/ke-recv/3.19-5/src/ke-recv.c 2009-08-03 11:41:13 UTC (rev 19021) @@ -1786,7 +1786,11 @@ if (state == S_HOST) { handle_usb_event(E_ENTER_HOST_MODE); } else if (state == S_PERIPHERAL_WAIT) { - handle_usb_event(E_ENTER_PERIPHERAL_WAIT_MODE); + if (getenv("TA_IMAGE")) + /* in TA image, we don't wait for user's decision */ + handle_usb_event(E_ENTER_PCSUITE_MODE); + else + handle_usb_event(E_ENTER_PERIPHERAL_WAIT_MODE); } else if (state == S_CABLE_DETACHED) { handle_usb_event(E_CABLE_DETACHED); } @@ -1872,9 +1876,13 @@ dbus_bool_t is_added) { if (is_added) { + /* ULOG_DEBUG_F("udi %s added %s", udi, key); + */ } else if (is_removed) { + /* ULOG_DEBUG_F("udi %s removed %s", udi, key); + */ } else { int val; @@ -3009,7 +3017,8 @@ break; case E_ENTER_PCSUITE_MODE: if (usb_state == S_PERIPHERAL_WAIT || - usb_state == S_CHARGING) { + usb_state == S_CHARGING || + usb_state == S_CABLE_DETACHED) { usb_state = S_PCSUITE; if (!enable_pcsuite()) { ULOG_ERR_F("Couldn't enable PC Suite"); Modified: projects/haf/tags/ke-recv/3.19-5/src/osso-mmc-mount.sh =================================================================== --- projects/haf/tags/ke-recv/3.19-5/src/osso-mmc-mount.sh 2009-08-03 07:39:46 UTC (rev 19020) +++ projects/haf/tags/ke-recv/3.19-5/src/osso-mmc-mount.sh 2009-08-03 11:41:13 UTC (rev 19021) @@ -77,6 +77,7 @@ for d in .sounds .videos .documents .images .camera; do mkdir -p $MP/$d done + touch $MP elif [ "x$MP" = "x/home/user/MyDocs" ]; then logger "$0: '$MP' is not writable" fi Modified: projects/haf/tags/ke-recv/3.19-5/src/pcsuite-enable.sh =================================================================== --- projects/haf/tags/ke-recv/3.19-5/src/pcsuite-enable.sh 2009-08-03 07:39:46 UTC (rev 19020) +++ projects/haf/tags/ke-recv/3.19-5/src/pcsuite-enable.sh 2009-08-03 11:41:13 UTC (rev 19021) @@ -36,13 +36,22 @@ logger "$0: failed to install g_nokia" exit 1 else - # TODO: remove the sleep when the wait is in place sleep 2 fi initctl emit --no-wait G_NOKIA_READY -# TODO: wait for the devices +# Wait until pnatd is ready +INC=1 +while [ "x$(pidof pnatd)x" = "xx" ]; do + if [ $INC -gt 20 ]; then + echo "$0: Error, pnatd did not start" + logger "$0: Error, pnatd did not start" + exit 1 + fi + sleep 1 + INC=`expr $INC + 1` +done OBEXD_PID=`pidof obexd` if [ $? != 0 ]; then
- Previous message: [maemo-commits] r19020 - projects/haf/tags/ke-recv
- Next message: [maemo-commits] r19022 - projects/haf/tags/ke-recv/3.19-5/src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]