Merge remote-tracking branch 'develop/tizen_2.3b' into tizen_2.3

Conflicts:
	AUTHORS
	filesystem/etc/emulator/model-config.sh
	filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
	filesystem/usr/lib/udev/rules.d/95-tizen-emulator.rules
	packaging/system-plugin-emulator.spec

diff --cc filesystem/etc/emulator/select-boot-animation.sh
index 0000000,0000000..289372a
new file mode 100755 (executable)
--- /dev/null
--- /dev/null
+++ b/filesystem/etc/emulator/select-boot-animation.sh
@@@ -1,0 -1,0 +1,24 @@@
++#/bin/sh -e
++
++CMDLINE=/proc/cmdline
++VIDEO=`sed s/.*video=// $CMDLINE | cut -d ' ' -f1`
++FORMAT=`echo $VIDEO | cut -d ':' -f2 | cut -d ',' -f2`
++RESOLUTION=`echo $FORMAT | cut -d '-' -f1`
++W=`echo $RESOLUTION | awk -Fx '{print $1}'`
++H=`echo $RESOLUTION | awk -Fx '{print $2}'`
++
++if [ -d /usr/share/edje ] && [ -d /usr/share/edje/emul ] &&
++   [ -f /usr/share/edje/emul/1X1_poweron.edj ] && [ -f /usr/share/edje/emul/1X1_poweroff.edj ] &&
++   [ -f /usr/share/edje/emul/3X4_poweron.edj ] && [ -f /usr/share/edje/emul/3X4_poweroff.edj ]
++then
++    rm -f /usr/share/edje/poweron.edj
++    rm -f /usr/share/edje/poweroff.edj
++    if [ $W == $H ]
++    then
++      ln -s emul/1X1_poweron.edj /usr/share/edje/poweron.edj
++      ln -s emul/1X1_poweroff.edj /usr/share/edje/poweroff.edj
++    else
++      ln -s emul/3X4_poweron.edj /usr/share/edje/poweron.edj
++      ln -s emul/3X4_poweroff.edj /usr/share/edje/poweroff.edj
++    fi
++fi

diff --cc filesystem/usr/lib/systemd/system/emul-common-preinit.service
index 3ad24cf,3ad24cf..641bdb1
--- 1/filesystem/usr/lib/systemd/system/emul-common-preinit.service
--- 2/filesystem/usr/lib/systemd/system/emul-common-preinit.service
+++ b/filesystem/usr/lib/systemd/system/emul-common-preinit.service
@@@ -9,6 -9,6 +9,8 @@@ Type=onesho
  
  # platform features
  ExecStartPre=/bin/sh -c '/etc/emulator/model-config.sh'
++# for boot-animation
++ExecStartPre=/bin/sh -c '/etc/emulator/select-boot-animation.sh'
  # W/A for alarm-service
  ExecStart=/bin/touch /dev/rtc1
  

diff --cc packaging/system-plugin-emulator.spec
index d07945c,3165610..29f25fc
--- 1/packaging/system-plugin-emulator.spec
--- 2/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@@ -71,18 -69,18 +69,21 @@@ cp LICENSE %{buildroot}/usr/share/licen
  %post
  #make fstab
  if [ -e /etc/fstab ]; then
- %if ("%{_repository}" == "mobile")
++%if "%{?tizen_profile_name}" == "mobile"
        echo "/opt/var   /var      bind    bind             0 0" >> /etc/fstab
 +%endif
        echo "tmpfs      /tmp      tmpfs   comment=havefs-smackfs-smackfsroot=* 0 0" >> /etc/fstab
        echo "/dev/vdb   swap      swap    defaults         0 0" >> /etc/fstab
  fi
  
+ %posttrans
+ #run emulator_ns.preinit script after all packages have been installed.
+ /etc/preconf.d/emulator_ns.preinit
+ 
  %files
- /etc/emulator/setup-audio-volume.sh
  /etc/emulator/mount-hostdir.sh
  /etc/emulator/model-config.sh
- /etc/init.d/setup-audio-volume
++/etc/emulator/select-boot-animation.sh
  /etc/init.d/mount-hostdir
  /etc/inittab
  /etc/preconf.d/emulator_ns.preinit