[maemo-commits] [maemo-commits] r19263 - in projects/haf/trunk/osso-af-startup: . debian services top-scripts

Mon Aug 31 13:10:43 EEST 2009

Author: schulhof
Date: 2009-08-31 13:10:30 +0300 (Mon, 31 Aug 2009)
New Revision: 19263

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
   projects/haf/trunk/osso-af-startup/services/launch-wrapper-tryrestart.sh
   projects/haf/trunk/osso-af-startup/services/nice-kill-launch-wrapper.sh
   projects/haf/trunk/osso-af-startup/top-scripts/af-services
Log:
Sync from projects

Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================

--- projects/haf/trunk/osso-af-startup/configure.ac	2009-08-31 10:04:57 UTC (rev 19262)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2009-08-31 10:10:30 UTC (rev 19263)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.79)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.80)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2009-08-31 10:04:57 UTC (rev 19262)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2009-08-31 10:10:30 UTC (rev 19263)
@@ -1,3 +1,33 @@
+osso-af-startup (1.80-2) unstable; urgency=low
+
+  * Fixes: NB#133780 - osso-af-startup shouldn't be overriding core VMM
+    settings 
+
+ -- David Kedves <kedazo at gmail.com>  Mon, 31 Aug 2009 11:11:39 +0200
+
+osso-af-startup (1.80-1) unstable; urgency=low
+
+  * launch wrappers stop function didn't work properly if 
+    the command had no parameters
+    Fixes NB#111442 - osso-app-killer-cud.sh shall be checked and refreshed
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu, 28 May 2009 17:17:42 +0200
+
+osso-af-startup (1.79-3) unstable; urgency=low
+
+  * Fixes: NB#109993 - AF Warning: '/etc/osso-af-init/matchbox.defs' not found 
+  * Fixes: NB#100464 - Please set SAPWOOD_DEBUG=scaling for development
+    releases
+
+ -- David Kedves <kedazo at gmail.com>  Mon, 20 Apr 2009 12:48:23 +0200
+
+osso-af-startup (1.79-2) unstable; urgency=low
+
+  * Package isn't touch the MyDocs directory 
+  * Fixes: NB#108773 - the contents of /etc/skel/MyDocs shall be empty
+
+ -- David Kedves <kedazo at gmail.com>  Thu, 09 Apr 2009 13:54:56 +0200
+
 osso-af-startup (1.79-1) unstable; urgency=low
 
   * If /etc/osso-af-init/locale is missing, undefine LC_ALL, and define LC_MESSAGES,

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2009-08-31 10:04:57 UTC (rev 19262)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2009-08-31 10:10:30 UTC (rev 19263)
@@ -1,12 +1,5 @@
 #!/bin/sh
 
-HAVE_SCRATCHBOX=0
-if [ -e /targets/links/scratchbox.config ] ; then
-  HAVE_SCRATCHBOX=1
-fi
-
-HOME=/etc/skel
-
 TMP_DIR=/var/tmp
 
 rm -f /etc/osso-af-init/gconf-dir
@@ -21,21 +14,9 @@
 # create memory card mount points ("if" is for Scratchbox)
 if [ -w / ]; then
   mkdir -p /media/mmc1 2> /dev/null
-  mkdir -p /media/mmc2 2> /dev/null
+  mkdir -p /home/user/MyDocs 2> /dev/null
 fi
 
-# create MyDocs and some special directories ("if" is for Scratchbox)
-
-if test $HAVE_SCRATCHBOX -eq 1; then
-  if [ -w $HOME ]; then
-    MYDOCS=$HOME/MyDocs
-    mkdir -p $MYDOCS/.sounds $MYDOCS/.videos \
-      $MYDOCS/.documents $MYDOCS/.games $MYDOCS/.images 2> /dev/null
-  else
-    echo "Warning: '$HOME' is not writable, couldn't create e.g. MyDocs directory"
-  fi
-fi
-
 # evil hack to ensure execute permissions
 chmod +x /etc/osso-af-init/get-devlock.sh
 

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2009-08-31 10:04:57 UTC (rev 19262)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2009-08-31 10:10:30 UTC (rev 19263)
@@ -157,10 +157,20 @@
   fi
 
   source_if_is osso-gtk.defs
-  source_if_is matchbox.defs
+# There is no matchbox.defs in Fremantle
+#  source_if_is matchbox.defs
   source_if_is keyboard.defs
   source_if_is sdl.defs
 
+  # Enabling SAPWOOD_DEBUG when device is in rd-mode and in scratchbox
+  if [ -d /scratchbox ]; then
+    export SAPWOOD_DEBUG=scaling
+  elif [ -f /usr/bin/cal-tool ]; then
+    if (/usr/bin/cal-tool --get-rd-mode | grep enabled) > /dev/null; then
+      export SAPWOOD_DEBUG=scaling
+    fi
+  fi
+
   export AF_DEFINES_SOURCED=1
 
 fi  ;# AF_DEFINES_SOURCED definition check

Modified: projects/haf/trunk/osso-af-startup/services/launch-wrapper-tryrestart.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/launch-wrapper-tryrestart.sh	2009-08-31 10:04:57 UTC (rev 19262)
+++ projects/haf/trunk/osso-af-startup/services/launch-wrapper-tryrestart.sh	2009-08-31 10:10:30 UTC (rev 19263)
@@ -46,15 +46,14 @@
 CMD=$1
 BASENAME=`basename $CMD`
 PIDFILE=$AF_PIDDIR/$BASENAME.pid
-shift
-PARAMS=$@
+CMDLINE="$@"
 
 if [ $STOP = TRUE ]; then
   echo "Stopping $SVC"
-  /usr/sbin/dsmetool -k "$CMD $PARAMS"
+  /usr/sbin/dsmetool -k "$CMDLINE"
 fi
 
 if [ $START = TRUE ]; then
   echo "Starting $SVC"
-  /usr/sbin/dsmetool -t "$CMD $PARAMS"
+  /usr/sbin/dsmetool -t "$CMDLINE"
 fi

Modified: projects/haf/trunk/osso-af-startup/services/nice-kill-launch-wrapper.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/nice-kill-launch-wrapper.sh	2009-08-31 10:04:57 UTC (rev 19262)
+++ projects/haf/trunk/osso-af-startup/services/nice-kill-launch-wrapper.sh	2009-08-31 10:10:30 UTC (rev 19263)
@@ -46,15 +46,14 @@
 CMD=$1
 BASENAME=`basename $CMD`
 PIDFILE=$AF_PIDDIR/$BASENAME.pid
-shift
-PARAMS=$@
+CMDLINE="$@"
 
 if [ $STOP = TRUE ]; then
   echo "Stopping $SVC"
-  /usr/sbin/dsmetool -S 9 -k "$CMD $PARAMS"
+  /usr/sbin/dsmetool -S 9 -k "$CMDLINE"
 fi
 
 if [ $START = TRUE ]; then
   echo "Starting $SVC"
-  /usr/sbin/dsmetool -n -1 -t "$CMD $PARAMS"
+  /usr/sbin/dsmetool -n -1 -t "$CMDLINE"
 fi

Modified: projects/haf/trunk/osso-af-startup/top-scripts/af-services
===================================================================
--- projects/haf/trunk/osso-af-startup/top-scripts/af-services	2009-08-31 10:04:57 UTC (rev 19262)
+++ projects/haf/trunk/osso-af-startup/top-scripts/af-services	2009-08-31 10:10:30 UTC (rev 19263)
@@ -20,27 +20,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-# Exclude some UIDs from memory allocation denial.
-UIDS=`getent passwd haldaemon systemui messagebus | cut -d: -f3`
-echo "Protecting UIDs $UIDS from the memory allocation denial."
-echo $UIDS > /proc/sys/vm/lowmem_allowed_uids
-
-# activate lowmem module
-echo 92 > /proc/sys/vm/lowmem_deny_watermark
-echo 85 > /proc/sys/vm/lowmem_notify_high
-echo 512 > /proc/sys/vm/lowmem_nr_decay_pages
-echo 80 > /proc/sys/vm/lowmem_notify_low
-
-# adjust other kernel parameters to minimize memory consumption 
-echo 16 > /proc/sys/kernel/pty/max
-echo 256 > /proc/sys/kernel/threads-max
-echo 32768 > /proc/sys/fs/file-max
-echo 1 > /proc/sys/vm/swappiness
-
-# adjust flushing of memory card buffers
-echo 120 > /proc/sys/vm/dirty_ratio
-echo 60 > /proc/sys/vm/dirty_background_ratio
-
 SCRIPT=/etc/osso-af-init/real-af-services
 
 case "$1" in

