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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-11-28 13:30:37 +0200 (Fri, 28 Nov 2008)
New Revision: 16799

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/af-defines.sh
Log:
Fixing NB#90854

Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-11-28 10:59:58 UTC (rev 16798)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-11-28 11:30:37 UTC (rev 16799)
@@ -1,5 +1,5 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.73)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.74)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-11-28 10:59:58 UTC (rev 16798)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-11-28 11:30:37 UTC (rev 16799)
@@ -1,3 +1,11 @@
+osso-af-startup (1.74-1) unstable; urgency=low
+
+  * Improved decision as to whether to define INTERNAL_MMC_MOUNTPOINT to be based
+    on the value of OSSO_PRODUCT_HARDWARE
+  * Fixes: NB#90854
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Fri, 28 Nov 2008 13:09:44 +0200
+
 osso-af-startup (1.73-1) unstable; urgency=low
 
   * Move destruction of /tmp/first-boot-flag-tmp to new /etc/init.d/zzzremove-first-boot-flag

Modified: projects/haf/trunk/osso-af-startup/services/af-defines.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-11-28 10:59:58 UTC (rev 16798)
+++ projects/haf/trunk/osso-af-startup/services/af-defines.sh	2008-11-28 11:30:37 UTC (rev 16799)
@@ -97,10 +97,34 @@
   # The MyDocs directory
   export MYDOCSDIR=$HOME/MyDocs
 
+  if [ ! -d /scratchbox ]; then
+    if [ ! -e /tmp/.opi.tmp -a -x /usr/bin/osso-product-info ]; then
+      if [ "x$USER" = "xroot" ]; then
+        _SUDO=''
+      else
+        _SUDO='sudo'
+      fi
+      $_SUDO /usr/bin/osso-product-info 1> /tmp/.opi.tmp.tmp 2> /dev/null
+      $_SUDO /bin/mv -f /tmp/.opi.tmp.tmp /tmp/.opi.tmp 2> /dev/null
+      unset _SUDO
+    fi
+    if [ -r /tmp/.opi.tmp ]; then
+      VNAMES=`awk -F '=' '{print $1}' < /tmp/.opi.tmp`
+      source /tmp/.opi.tmp
+      export $VNAMES
+      unset VNAMES
+    fi
+  fi
+
   # Mount point of the MMC
   export MMC_MOUNTPOINT='/media/mmc1' MMC_DEVICE_FILE='/dev/mmcblk0p1'
-  echo `uname -m` | grep "armv6l" > /dev/null
-  if [ $? = 0 ]; then
+
+  # Only the following hardware types have internal MMCs
+  if test "x$OSSO_PRODUCT_HARDWARE" = "xRX-34" || \
+     test "x$OSSO_PRODUCT_HARDWARE" = "xRX-44" || \
+     test "x$OSSO_PRODUCT_HARDWARE" = "xRX-48" || \
+     test "x$OSSO_PRODUCT_HARDWARE" = "xRX-51"; then
+
     export INTERNAL_MMC_MOUNTPOINT='/media/mmc2'
     export INTERNAL_MMC_SWAP_LOCATION=$INTERNAL_MMC_MOUNTPOINT
     export OSSO_SWAP=$INTERNAL_MMC_MOUNTPOINT
@@ -124,25 +148,6 @@
   source_if_is keyboard.defs
   source_if_is sdl.defs
 
-  if [ ! -d /scratchbox ]; then
-    if [ ! -e /tmp/.opi.tmp -a -x /usr/bin/osso-product-info ]; then
-      if [ "x$USER" = "xroot" ]; then
-        _SUDO=''
-      else
-        _SUDO='sudo'
-      fi
-      $_SUDO /usr/bin/osso-product-info 1> /tmp/.opi.tmp.tmp 2> /dev/null
-      $_SUDO /bin/mv -f /tmp/.opi.tmp.tmp /tmp/.opi.tmp 2> /dev/null
-      unset _SUDO
-    fi
-    if [ -r /tmp/.opi.tmp ]; then
-      VNAMES=`awk -F '=' '{print $1}' < /tmp/.opi.tmp`
-      source /tmp/.opi.tmp
-      export $VNAMES
-      unset VNAMES
-    fi
-  fi
-
   export AF_DEFINES_SOURCED=1
 
 fi  ;# AF_DEFINES_SOURCED definition check