tizen 2.4 release accepted/tizen_2.4_mobile tizen_2.4 accepted/tizen/2.4/mobile/20151029.024738 submit/tizen_2.4/20151028.065745 tizen_2.4_mobile_release
authorjk7744.park <jk7744.park@samsung.com>
Sat, 24 Oct 2015 10:08:51 +0000 (19:08 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Sat, 24 Oct 2015 10:08:51 +0000 (19:08 +0900)
19 files changed:
filesystem/etc/emulator/mount-hostdir.sh [deleted file]
filesystem/etc/emulator/prerun [new file with mode: 0644]
filesystem/etc/emulator/prerun.d/generate-emulator-env.sh [new file with mode: 0644]
filesystem/etc/emulator/prerun.d/opengl-es-setup-yagl-env.sh [new file with mode: 0755]
filesystem/etc/emulator/prerun.d/set-model-config.sh [moved from filesystem/etc/emulator/model-config.sh with 69% similarity, mode: 0644]
filesystem/etc/emulator/select-boot-animation.sh [deleted file]
filesystem/etc/init.d/mount-hostdir [deleted file]
filesystem/etc/machine-id [new file with mode: 0644]
filesystem/etc/profile.d/emulator_ecore_workaround.sh [new file with mode: 0644]
filesystem/etc/profile.d/proxy_setting.sh [deleted file]
filesystem/usr/lib/systemd/system/dev-disk-by\x2dlabel-emulator\x2dswap.swap [new file with mode: 0644]
filesystem/usr/lib/systemd/system/emul-common-preinit.service
filesystem/usr/lib/systemd/system/emul-mount-hostdir.service [deleted file]
filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
filesystem/usr/lib/systemd/system/tizen-generate-env.service
filesystem/usr/lib/systemd/system/wm_ready.service
filesystem/usr/lib/udev/rules.d/95-tizen-emulator.rules
packaging/system-plugin-emulator.manifest
packaging/system-plugin-emulator.spec

diff --git a/filesystem/etc/emulator/mount-hostdir.sh b/filesystem/etc/emulator/mount-hostdir.sh
deleted file mode 100755 (executable)
index 08a9ba1..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Mount host directory on /mnt/host via virtio-9p
-
-if grep "virtio-9p" /proc/cmdline ; then
-    if mount -t 9p -o trans=virtio fileshare /mnt/host -oversion=9p2000.L -o msize=65536; then
-        echo -e "[${_Y}Mount.9pfs succeed${C_}]"
-    else
-        echo -e "[${_R}Mount.9pfs fail!!!!${C_}]"
-    fi
-fi
-
diff --git a/filesystem/etc/emulator/prerun b/filesystem/etc/emulator/prerun
new file mode 100644 (file)
index 0000000..33451de
--- /dev/null
@@ -0,0 +1,27 @@
+# This script is executed in initramfs.
+
+if [ ! -z $1 ]; then
+        NEW_ROOT=$1
+        # if NEW_ROOT is passed, it executed by initramfs.
+        # So, we should prepare some core utils.
+        /bin/busybox ln -sf /bin/busybox /bin/ln
+        ln -sf /bin/busybox /bin/sed
+        ln -sf /bin/busybox /bin/grep
+        ln -sf /bin/busybox /bin/cut
+        ln -sf /bin/busybox /bin/tr
+        ln -sf /bin/busybox /bin/expr
+        ln -sf /bin/busybox /bin/readlink
+        ln -sf /bin/busybox /bin/rm
+else
+        NEW_ROOT=
+fi
+
+if [ -d $NEW_ROOT/etc/emulator/prerun.d ]; then
+  for i in $NEW_ROOT/etc/emulator/prerun.d/*.sh; do
+    if [ -r $i ]; then
+      . $i
+    fi
+  done
+  unset i
+fi
+
diff --git a/filesystem/etc/emulator/prerun.d/generate-emulator-env.sh b/filesystem/etc/emulator/prerun.d/generate-emulator-env.sh
new file mode 100644 (file)
index 0000000..d72ee6b
--- /dev/null
@@ -0,0 +1,45 @@
+if [ ! -z $1 ]; then
+    NEW_ROOT=$1
+else
+    NEW_ROOT=
+fi
+
+CMDLINE=/proc/cmdline
+EMULATOR_ENV=$NEW_ROOT/etc/profile.d/emulator_env.sh
+
+##### network proxy environments
+echo -e "*** Generating network proxy env"
+
+if [ -f $EMULATOR_ENV ]; then
+    rm -f $EMULATOR_ENV
+fi
+
+# for busybux ash
+PROXIES0="http_proxy"
+PROXIES1="https_proxy"
+PROXIES2="ftp_proxy"
+PROXIES3="socks_proxy"
+
+URLS0="http"
+URLS1="https"
+URLS2="ftp"
+URLS3="socks"
+
+for index in 0 1 2 3
+do
+    eval PROXY="\$PROXIES$index"
+    eval URL="\$URLS$index"
+    if [ ! -z ${PROXY} ] ; then
+        EXPORT_CONTENT="${PROXY}="
+        if grep -q ${PROXY} $CMDLINE ; then
+            __PROXY=`sed "s/^.*${PROXY}=\([^, ]*\).*$/\1/g" $CMDLINE`
+            if [ "x${__PROXY}" != "x" ] ; then
+                EXPORT_CONTENT="${EXPORT_CONTENT}${URL}://${__PROXY}/" >> $EMULATOR_ENV
+            fi
+        fi
+        echo "export ${EXPORT_CONTENT}" >> $EMULATOR_ENV
+        echo -e "- ${EXPORT_CONTENT}"
+    fi
+done
+echo "export no_proxy=localhost,127.0.0.1/8,10.0.2.0/24" >> $EMULATOR_ENV
+echo -e "- no_proxy=localhost,127.0.0.1/8,10.0.2.0/24"
diff --git a/filesystem/etc/emulator/prerun.d/opengl-es-setup-yagl-env.sh b/filesystem/etc/emulator/prerun.d/opengl-es-setup-yagl-env.sh
new file mode 100755 (executable)
index 0000000..d713183
--- /dev/null
@@ -0,0 +1,31 @@
+ #!/bin/sh
+if [ ! -z $1 ]; then
+        NEW_ROOT=$1
+else
+        NEW_ROOT=
+fi
+
+USR_LIB=$NEW_ROOT/usr/lib
+YAGL_PATH=/usr/lib/yagl
+DUMMY_PATH=/usr/lib/dummy-gl
+
+echo -e "[${_G} Opengl-es acceleration module setting. ${C_}]"
+if [ -e /dev/yagl ] ; then
+    echo -e "[${_G} Emulator support gles hw acceleration. ${C_}]"
+    echo -e "[${_G} Apply to use hw gles library. ${C_}]"
+    ln -s -f $YAGL_PATH/libEGL.so.1.0 $USR_LIB/libEGL.so
+    ln -s -f $YAGL_PATH/libEGL.so.1.0 $USR_LIB/libEGL.so.1
+    ln -s -f $YAGL_PATH/libGLESv1_CM.so.1.0 $USR_LIB/libGLESv1_CM.so
+    ln -s -f $YAGL_PATH/libGLESv1_CM.so.1.0 $USR_LIB/libGLESv1_CM.so.1
+    ln -s -f $YAGL_PATH/libGLESv2.so.1.0 $USR_LIB/libGLESv2.so
+    ln -s -f $YAGL_PATH/libGLESv2.so.1.0 $USR_LIB/libGLESv2.so.1
+else
+    echo -e "[${_G} Emulator does *not* support gles hw acceleration. ${C_}]"
+    echo -e "[${_G} Apply to use gles stub library. ${C_}]"
+    ln -s -f $DUMMY_PATH/libEGL_dummy.so $USR_LIB/libEGL.so
+    ln -s -f $DUMMY_PATH/libEGL_dummy.so $USR_LIB/libEGL.so.1
+    ln -s -f $DUMMY_PATH/libGLESv1_dummy.so $USR_LIB/libGLESv1_CM.so
+    ln -s -f $DUMMY_PATH/libGLESv1_dummy.so $USR_LIB/libGLESv1_CM.so.1
+    ln -s -f $DUMMY_PATH/libGLESv2_dummy.so $USR_LIB/libGLESv2.so
+    ln -s -f $DUMMY_PATH/libGLESv2_dummy.so $USR_LIB/libGLESv2.so.1
+fi
old mode 100755 (executable)
new mode 100644 (file)
similarity index 69%
rename from filesystem/etc/emulator/model-config.sh
rename to filesystem/etc/emulator/prerun.d/set-model-config.sh
index 96a29e1..92767e5
@@ -1,15 +1,22 @@
-#!/bin/sh
+if [ ! -z $1 ]; then
+        NEW_ROOT=$1
+else
+        NEW_ROOT=
+fi
+
 
 CMDLINE=/proc/cmdline
-XML=/etc/config/model-config.xml
+XML=$NEW_ROOT/etc/config/model-config.xml
 
+echo -e "*** Setting model-config.xml"
 
-echo -e "[${_G} model config setting ${C_}]"
+if [ ! -f $XML ] ; then
+    echo -e "- model-config.xml does not exist"
+    exit
+fi
 
 # display resolution
-if grep --silent "video=" $CMDLINE ; then
-        echo -e "[${_G} modify the resolution value of platform features: ${C_}]"
-
+if grep -q "video=" $CMDLINE ; then
         VIDEO=`sed s/.*video=// $CMDLINE | cut -d ' ' -f1`
         FORMAT=`echo $VIDEO | cut -d ':' -f2 | cut -d ',' -f2`
         RESOLUTION=`echo $FORMAT | cut -d '-' -f1`
@@ -18,13 +25,13 @@ if grep --silent "video=" $CMDLINE ; then
 
         TR_NUM=`echo $WIDTH$HEIGHT | tr -d '[0-9]'`
         if [ "$TR_NUM" != "" ] ; then
-            echo "non-integer argument"
+            echo -e "- resolution value is non-integer argument"
         else
             WIDTH_KEY="tizen.org\/feature\/screen.width\" type=\"int\""
             sed -i s/"$WIDTH_KEY".*\</"$WIDTH_KEY"\>"$WIDTH"\</ $XML
             HEIGHT_KEY="tizen.org\/feature\/screen.height\" type=\"int\""
             sed -i s/"$HEIGHT_KEY".*\</"$HEIGHT_KEY"\>"$HEIGHT"\</ $XML
-            echo -e "[${_G} width=$WIDTH, height=$HEIGHT ${C_}]"
+            echo -e "- width=$WIDTH, height=$HEIGHT"
 
             # screen size
             SCREENSIZE_KEY="tizen.org\/feature\/screen.size"
@@ -38,20 +45,23 @@ if grep --silent "video=" $CMDLINE ; then
 fi
 
 # dot per inch
-if grep --silent "dpi=" $CMDLINE ; then
-        echo -e "[${_G} modify the dpi value of platform features: ${C_}]"
-
+if grep -q "dpi=" $CMDLINE ; then
         DPI=`sed s/.*dpi=// $CMDLINE | cut -d ' ' -f1`
 
         TR_NUM=`echo $DPI | tr -d '[0-9]'`
         if [ "$TR_NUM" != "" ] ; then
-            echo "non-integer argument"
+            echo -e "- dpi value is non-integer argument"
         else
-            SCREEN_DPI=`expr "$DPI" "/" 10`
+            #temp
+            if [ "$DPI" -gt "999" ] ; then
+                SCREEN_DPI=`expr "$DPI" "/" 10`
+            else
+                SCREEN_DPI="$DPI"
+            fi
 
             DPI_KEY="tizen.org\/feature\/screen.dpi\" type=\"int\""
             sed -i s/"$DPI_KEY".*\</"$DPI_KEY"\>"$SCREEN_DPI"\</ $XML
-            echo -e "[${_G} dpi=$SCREEN_DPI ${C_}]"
+            echo -e "- dpi=$SCREEN_DPI"
         fi
 fi
 
diff --git a/filesystem/etc/emulator/select-boot-animation.sh b/filesystem/etc/emulator/select-boot-animation.sh
deleted file mode 100755 (executable)
index 289372a..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#/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 --git a/filesystem/etc/init.d/mount-hostdir b/filesystem/etc/init.d/mount-hostdir
deleted file mode 100755 (executable)
index ccdc3e4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/etc/emulator/mount-hostdir.sh
diff --git a/filesystem/etc/machine-id b/filesystem/etc/machine-id
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/filesystem/etc/profile.d/emulator_ecore_workaround.sh b/filesystem/etc/profile.d/emulator_ecore_workaround.sh
new file mode 100644 (file)
index 0000000..a2e55fb
--- /dev/null
@@ -0,0 +1,2 @@
+# W/A for incorrect rendering
+export ECORE_EVAS_FORCE_SYNC_RENDER=1
diff --git a/filesystem/etc/profile.d/proxy_setting.sh b/filesystem/etc/profile.d/proxy_setting.sh
deleted file mode 100755 (executable)
index 05970da..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-if grep -q "http_proxy=" /proc/cmdline ; then
-        __proxy=`sed 's/^.*http_proxy=\([^, ]*\).*$/\1/g' /proc/cmdline`
-        if [ "x${__proxy}" = "x" ]; then
-            export "http_proxy="
-        else
-            export "http_proxy=http://${__proxy}/"
-        fi
-fi
-if grep -q "https_proxy=" /proc/cmdline ; then
-        __proxy=`sed 's/^.*https_proxy=\([^, ]*\).*$/\1/g' /proc/cmdline`
-        if [ "x${__proxy}" = "x" ]; then
-            export "https_proxy="
-        else
-            export "https_proxy=https://${__proxy}/"
-        fi
-fi
-if grep -q "ftp_proxy=" /proc/cmdline ; then
-        __proxy=`sed 's/^.*ftp_proxy=\([^, ]*\).*$/\1/g' /proc/cmdline`
-        if [ "x${__proxy}" = "x" ]; then
-            export "ftp_proxy="
-        else
-            export "ftp_proxy=ftp://${__proxy}/"
-        fi
-fi
-if grep -q "socks_proxy=" /proc/cmdline ; then
-        __proxy=`sed 's/^.*socks_proxy=\([^, ]*\).*$/\1/g' /proc/cmdline`
-        if [ "x${__proxy}" = "x" ]; then
-            export "socks_proxy="
-        else
-            export "socks_proxy=socks://${__proxy}/"
-        fi
-fi
-export "no_proxy=localhost,127.0.0.1/8,10.0.0.0/16"
diff --git a/filesystem/usr/lib/systemd/system/dev-disk-by\x2dlabel-emulator\x2dswap.swap b/filesystem/usr/lib/systemd/system/dev-disk-by\x2dlabel-emulator\x2dswap.swap
new file mode 100644 (file)
index 0000000..d4d5f12
--- /dev/null
@@ -0,0 +1,8 @@
+[Unit]
+Description=Swap on emulator
+
+[Swap]
+What=/dev/disk/by-label/emulator-swap
+
+[Install]
+WantedBy=emulator_preinit.target
index 641bdb1..ccea9ec 100644 (file)
@@ -7,10 +7,11 @@ Before=basic.target
 [Service]
 Type=oneshot
 
-# platform features
-ExecStartPre=/bin/sh -c '/etc/emulator/model-config.sh'
-# for boot-animation
-ExecStartPre=/bin/sh -c '/etc/emulator/select-boot-animation.sh'
+# execute prerun scripts.
+# it is not necessary because it is already executed from initramfs.
+# commented out for debugging.
+#ExecStartPre=/bin/sh -c '. /etc/emulator/prerun'
+
 # W/A for alarm-service
 ExecStart=/bin/touch /dev/rtc1
 
diff --git a/filesystem/usr/lib/systemd/system/emul-mount-hostdir.service b/filesystem/usr/lib/systemd/system/emul-mount-hostdir.service
deleted file mode 100644 (file)
index 4e79310..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Mount host directory
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-ExecStart=/etc/emulator/mount-hostdir.sh
-
-[Install]
-WantedBy=emulator_preinit.target
index 351d420..a165f56 100644 (file)
@@ -4,10 +4,10 @@ DefaultDependencies=no
 
 [Service]
 Type=oneshot
-ExecStart=/opt/usr/devel/usr/bin/amixer "cset" "name='Master Playback Switch'" "1"
-ExecStart=/opt/usr/devel/usr/bin/amixer "cset" "name='Master Playback Volume'" "50"
-ExecStart=/opt/usr/devel/usr/bin/amixer "cset" "name='PCM Playback Switch'" "1"
-ExecStart=/opt/usr/devel/usr/bin/amixer "cset" "name='PCM Playback Volume'" "31"
+ExecStart=/usr/bin/amixer "cset" "name='Master Playback Switch'" "1"
+ExecStart=/usr/bin/amixer "cset" "name='Master Playback Volume'" "50"
+ExecStart=/usr/bin/amixer "cset" "name='PCM Playback Switch'" "1"
+ExecStart=/usr/bin/amixer "cset" "name='PCM Playback Volume'" "31"
 
 [Install]
 WantedBy=emulator_preinit.target
index 7e860a5..9c1834d 100644 (file)
@@ -7,6 +7,7 @@ Before=basic.target
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/env -i sh -c 'source /etc/profile; env | egrep -v "^(HOME|PWD|SHLVL|_)=" > /run/tizen-mobile-env'
+ExecStartPost=/usr/bin/chsmack -a "_" /run/tizen-mobile-env
 
 [Install]
 WantedBy=basic.target
index d8c182f..00d287f 100644 (file)
@@ -6,6 +6,7 @@ Before=tizen-boot.target
 [Service]
 Type=oneshot
 ExecStart=/bin/sh -c 'while [ ! -e /tmp/.wm_ready ]; do sleep 0.1 ; done'
+TimeoutSec=30s
 
 [Install]
 WantedBy=tizen-boot.target
index 18b3fae..a801686 100644 (file)
@@ -1,16 +1,13 @@
-KERNEL=="glmem",        MODE="0666", SECLABEL{smack}="*"
-KERNEL=="yagl",         MODE="0666", SECLABEL{smack}="*"
-KERNEL=="esm",          MODE="0666", SECLABEL{smack}="*"
-
-KERNEL=="brillcodec",   GROUP="hwcodec", MODE="0666", SECLABEL{smack}="*"
-
-KERNEL=="video0",       GROUP="camera", MODE="0660", SECLABEL{smack}="device::camera"
-KERNEL=="video1",       GROUP="video", MODE="0660", SECLABEL{smack}="device::video"
-KERNEL=="video2",       GROUP="video", MODE="0660", SECLABEL{smack}="device::video"
-
-KERNEL=="vdpram*",      MODE="0644"
-
-# Moved from /etc/rc.d/rc3.d/S30brightness
-SUBSYSTEM=="lcd", ATTR{lcd_power}=="?*", RUN+="/bin/chown :system_bklight 0664 %S/%p/lcd_power"
-
-SUBSYSTEM=="drm", SECLABEL{smack}="*"
+KERNEL=="yagl", GROUP="video", MODE="0660", SECLABEL{smack}="*"
+SUBSYSTEM=="drm", GROUP="video", MODE="0660", SECLABEL{smack}="*"
+KERNEL=="brillcodec", GROUP="hwcodec", MODE="0666", SECLABEL{smack}="*"
+KERNEL=="video0", GROUP="camera", MODE="0660", SECLABEL{smack}="device::camera"
+KERNEL=="video1", GROUP="video", MODE="0660", SECLABEL{smack}="device::video"
+KERNEL=="video2", GROUP="video", MODE="0660", SECLABEL{smack}="device::video"
+KERNEL=="vdpram*", GROUP="system", MODE="0660", SECLABEL{smack}="*"
+
+# not enabled now
+#KERNEL=="esm", MODE="0660", SECLABEL{smack}="*"
+
+# SDCard
+KERNEL=="vd[a-z]", ENV{ID_FS_LABEL_ENC}=="emul-sdcard*" SYMLINK+="sdcard/%k"
index 017d22d..c79ed98 100644 (file)
@@ -1,5 +1,16 @@
 <manifest>
- <request>
 <request>
     <domain name="_"/>
- </request>
+  </request>
+  <assign>
+    <filesystem path='/etc/emulator/prerun.d/generate-emulator-env.sh' exec_label='none' />
+    <filesystem path='/etc/emulator/prerun.d/set-model-config.sh' exec_label='none' />
+    <filesystem path='/etc/rc.d/rc.sysinit' exec_label='none' />
+    <filesystem path='/etc/rc.d/rc.emul' exec_label='none' />
+    <filesystem path='/etc/rc.d/rc.shutdown' exec_label='none' />
+    <filesystem path='/etc/rc.d/rc.firstboot' exec_label='none' />
+    <filesystem path='/etc/preconf.d/emulator_ns.preinit' exec_label='none' />
+    <filesystem path='/etc/preconf.d/systemd_conf.preinit' exec_label='none' />
+    <filesystem path='/etc/profile.d/proxy_setting.sh' exec_label='none' />
+  </assign>
 </manifest>
index 29f25fc..f0ad6ac 100644 (file)
@@ -1,5 +1,5 @@
 Name: system-plugin-emulator
-Version: 0.1.5
+Version: 0.1.11
 Release: 1
 
 %define systemd_dir     /usr/lib/systemd
@@ -28,21 +28,14 @@ System plugin files for emulator
 find . -name .gitignore -exec rm -f {} \;
 cp -arf filesystem/* %{buildroot}
 
-# for legacy init
-if [ ! -d %{buildroot}/etc/rc.d/rc3.d ]; then
-    mkdir -p %{buildroot}/etc/rc.d/rc3.d
-fi
-ln -s /etc/init.d/mount-hostdir %{buildroot}//etc/rc.d/rc3.d/S03mount-hostdir
-ln -s /etc/init.d/ssh %{buildroot}/etc/rc.d/rc3.d/S50ssh
-
 # for systemd
 # for emulator_preinit.target
 mkdir -p %{buildroot}/%{systemd_dir}/system/basic.target.wants
 ln -s %{systemd_dir}/system/emulator_preinit.target %{buildroot}/%{systemd_dir}/system/basic.target.wants/
 mkdir -p %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants
 ln -s %{systemd_dir}/system/emul-setup-audio-volume.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
-ln -s %{systemd_dir}/system/emul-mount-hostdir.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
 ln -s %{systemd_dir}/system/emul-common-preinit.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
+ln -s %{systemd_dir}/system/dev-disk-by\\x2dlabel-emulator\\x2dswap.swap %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
 # for emulator.target
 mkdir -p %{buildroot}/%{systemd_dir}/system/multi-user.target.wants
 ln -s %{systemd_dir}/system/emulator.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/
@@ -59,21 +52,20 @@ mkdir -p %{buildroot}/%{systemd_dir}/system/tizen-boot.target.wants
 ln -s ../wm_ready.service %{buildroot}/%{systemd_dir}/system/tizen-boot.target.wants/
 mkdir -p %{buildroot}/%{systemd_dir}/system/tizen-system.target.wants
 
-# for host file sharing
-mkdir -p %{buildroot}/mnt/host
-
 # include license
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
 
+%if "%{?tizen_profile_name}" == "mobile" || "%{?tizen_profile_name}" == "tv"
+touch %{buildroot}/etc/machine-id
+%else
+rm %{buildroot}/etc/machine-id
+%endif
+
 %post
 #make fstab
 if [ -e /etc/fstab ]; then
-%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
@@ -81,20 +73,21 @@ fi
 /etc/preconf.d/emulator_ns.preinit
 
 %files
-/etc/emulator/mount-hostdir.sh
-/etc/emulator/model-config.sh
-/etc/emulator/select-boot-animation.sh
-/etc/init.d/mount-hostdir
+/etc/emulator/prerun
+/etc/emulator/prerun.d/set-model-config.sh
+/etc/emulator/prerun.d/generate-emulator-env.sh
+/etc/emulator/prerun.d/opengl-es-setup-yagl-env.sh
 /etc/inittab
+%if "%{?tizen_profile_name}" == "mobile" || "%{?tizen_profile_name}" == "tv"
+/etc/machine-id
+%endif
 /etc/preconf.d/emulator_ns.preinit
 /etc/preconf.d/systemd_conf.preinit
-/etc/profile.d/proxy_setting.sh
+/etc/profile.d/emulator_ecore_workaround.sh
 /etc/rc.d/rc.emul
 /etc/rc.d/rc.firstboot
 /etc/rc.d/rc.shutdown
 /etc/rc.d/rc.sysinit
-/etc/rc.d/rc3.d/S03mount-hostdir
-/etc/rc.d/rc3.d/S50ssh
 /etc/systemd/default-extra-dependencies/ignore-units
 /usr/lib/systemd/system/emulator_preinit.target
 /usr/lib/systemd/system/emulator.target
@@ -107,11 +100,11 @@ fi
 /usr/lib/systemd/system/multi-user.target.wants/tizen-system.target
 /usr/lib/systemd/system/multi-user.target.wants/tizen-runtime.target
 /usr/lib/systemd/system/emul-setup-audio-volume.service
-/usr/lib/systemd/system/emul-mount-hostdir.service
 /usr/lib/systemd/system/emul-common-preinit.service
+/usr/lib/systemd/system/dev-disk-by\x2dlabel-emulator\x2dswap.swap
 /usr/lib/systemd/system/emulator_preinit.target.wants/emul-setup-audio-volume.service
-/usr/lib/systemd/system/emulator_preinit.target.wants/emul-mount-hostdir.service
 /usr/lib/systemd/system/emulator_preinit.target.wants/emul-common-preinit.service
+/usr/lib/systemd/system/emulator_preinit.target.wants/dev-disk-by\x2dlabel-emulator\x2dswap.swap
 /usr/lib/systemd/system/tizen-boot.target
 /usr/lib/systemd/system/tizen-system.target
 /usr/lib/systemd/system/tizen-runtime.target
@@ -122,5 +115,6 @@ fi
 /usr/lib/systemd/system/tizen-generate-env.service
 /usr/lib/udev/rules.d/51-tizen-udev-default.rules
 /usr/lib/udev/rules.d/95-tizen-emulator.rules
-%dir /mnt/host
 /usr/share/license/%{name}
+%manifest packaging/%{name}.manifest
+