tizen 2.3 release

diff --git a/AUTHORS b/AUTHORS
index 978df0f..c9d544d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,5 @@
 YeongKyoon Lee <yeongkyoon.lee@samsung.com>
-DaiYoung Kim <daiyoung777.kim@samsung.com>
 SeokYeon Hwang <syeon.hwang@samsung.com>
-SangJin Kim <sangjin3.kim@samsung.com>
 KiTae Kim <kt920.kim@samsung.com>
 JinHyung Jo <jinhyung.jo@samsung.com>
 SungMin Ha <sungmin82.ha@samsung.com>

diff --git a/filesystem/etc/emulator/model-config.sh b/filesystem/etc/emulator/model-config.sh
index a9f3e81..96a29e1 100755 (executable)
--- a/filesystem/etc/emulator/model-config.sh
+++ b/filesystem/etc/emulator/model-config.sh
@@ -27,35 +27,13 @@ if grep --silent "video=" $CMDLINE ; then
             echo -e "[${_G} width=$WIDTH, height=$HEIGHT ${C_}]"
 
             # screen size
-            SCREENSIZE_KEY="tizen.org\/feature\/screen.size.normal."
-            SCREENSIZE_KEY_WQVGA=""$SCREENSIZE_KEY"240.400\" type=\"bool\""
-            SCREENSIZE_KEY_HVGA=""$SCREENSIZE_KEY"320.480\" type=\"bool\""
-            SCREENSIZE_KEY_WVGA=""$SCREENSIZE_KEY"480.800\" type=\"bool\""
-            SCREENSIZE_KEY_WSVGA=""$SCREENSIZE_KEY"600.1024\" type=\"bool\""
-            SCREENSIZE_KEY_HD=""$SCREENSIZE_KEY"720.1280\" type=\"bool\""
-            SCREENSIZE_KEY_FHD=""$SCREENSIZE_KEY"1080.1920\" type=\"bool\""
+            SCREENSIZE_KEY="tizen.org\/feature\/screen.size"
+            SCREENSIZE_KEY_NORMAL=""$SCREENSIZE_KEY".normal"
+            SCREENSIZE_KEY_NORMAL_RESOLUTION=""$SCREENSIZE_KEY_NORMAL"."$WIDTH"."$HEIGHT"\" type=\"bool\""
 
-            if [ $WIDTH -eq 480 ] && [ $HEIGHT -eq 800 ] ; then
-                # WVGA
-                sed -i s/"$SCREENSIZE_KEY_WVGA".*\</"$SCREENSIZE_KEY_WVGA"\>true\</ $XML
-                sed -i s/"$SCREENSIZE_KEY_HD".*\</"$SCREENSIZE_KEY_HD"\>false\</ $XML
-                sed -i s/"$SCREENSIZE_KEY_FHD".*\</"$SCREENSIZE_KEY_FHD"\>false\</ $XML
-            elif [ $WIDTH -eq 720 ] && [ $HEIGHT -eq 1280 ] ; then
-                # HD
-                sed -i s/"$SCREENSIZE_KEY_WVGA".*\</"$SCREENSIZE_KEY_WVGA"\>false\</ $XML
-                sed -i s/"$SCREENSIZE_KEY_HD".*\</"$SCREENSIZE_KEY_HD"\>true\</ $XML
-                sed -i s/"$SCREENSIZE_KEY_FHD".*\</"$SCREENSIZE_KEY_FHD"\>false\</ $XML
-            elif [ $WIDTH -eq 1080 ] && [ $HEIGHT -eq 1920 ] ; then
-                # FHD
-                sed -i s/"$SCREENSIZE_KEY_WVGA".*\</"$SCREENSIZE_KEY_WVGA"\>false\</ $XML
-                sed -i s/"$SCREENSIZE_KEY_HD".*\</"$SCREENSIZE_KEY_HD"\>false\</ $XML
-                sed -i s/"$SCREENSIZE_KEY_FHD".*\</"$SCREENSIZE_KEY_FHD"\>true\</ $XML
-            else
-                # etc
-                sed -i s/"$SCREENSIZE_KEY_WVGA".*\</"$SCREENSIZE_KEY_WVGA"\>false\</ $XML
-                sed -i s/"$SCREENSIZE_KEY_HD".*\</"$SCREENSIZE_KEY_HD"\>false\</ $XML
-                sed -i s/"$SCREENSIZE_KEY_FHD".*\</"$SCREENSIZE_KEY_FHD"\>false\</ $XML
-            fi
+            sed -i s/"$SCREENSIZE_KEY_NORMAL".[0-9].*"type=\"bool\"".*true/"&!!!"/ $XML
+            sed -i s/true!!!/false/ $XML
+            sed -i s/"$SCREENSIZE_KEY_NORMAL_RESOLUTION".*\</"$SCREENSIZE_KEY_NORMAL_RESOLUTION"\>true\</ $XML
         fi
 fi
 

diff --git a/filesystem/etc/emulator/select-boot-animation.sh b/filesystem/etc/emulator/select-boot-animation.sh
new file mode 100755 (executable)
index 0000000..289372a
--- /dev/null
+++ b/filesystem/etc/emulator/select-boot-animation.sh
@@ -0,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 --git a/filesystem/etc/emulator/setup-audio-volume.sh b/filesystem/etc/emulator/setup-audio-volume.sh
deleted file mode 100755 (executable)
index 199e19b..0000000
--- a/filesystem/etc/emulator/setup-audio-volume.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-amixer cset name='Master Playback Switch' 1
-amixer cset name='Master Playback Volume' 50
-amixer cset name='PCM Playback Switch' 1
-amixer cset name='PCM Playback Volume' 50

diff --git a/filesystem/etc/init.d/setup-audio-volume b/filesystem/etc/init.d/setup-audio-volume
deleted file mode 100755 (executable)
index 09ba1a5..0000000
--- a/filesystem/etc/init.d/setup-audio-volume
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/etc/emulator/setup-audio-volume.sh

diff --git a/filesystem/usr/lib/systemd/system/emul-common-preinit.service b/filesystem/usr/lib/systemd/system/emul-common-preinit.service
index 3ad24cf..641bdb1 100644 (file)
--- a/filesystem/usr/lib/systemd/system/emul-common-preinit.service
+++ b/filesystem/usr/lib/systemd/system/emul-common-preinit.service
@@ -9,6 +9,8 @@ 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'
 # W/A for alarm-service
 ExecStart=/bin/touch /dev/rtc1
 

diff --git a/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service b/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
index f930330..351d420 100644 (file)
--- a/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
+++ b/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
@@ -4,7 +4,10 @@ DefaultDependencies=no
 
 [Service]
 Type=oneshot
-ExecStart=/etc/emulator/setup-audio-volume.sh
+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"
 
 [Install]
 WantedBy=emulator_preinit.target

diff --git a/filesystem/usr/lib/systemd/system/tizen-boot.target b/filesystem/usr/lib/systemd/system/tizen-boot.target
new file mode 100644 (file)
index 0000000..1533be5
--- /dev/null
+++ b/filesystem/usr/lib/systemd/system/tizen-boot.target
@@ -0,0 +1,6 @@
+[Unit]
+Description=Tizen Boot
+Requires=basic.target
+Conflicts=rescue.service rescue.target
+After=basic.target rescue.service rescue.target
+Before=multi-user.target

diff --git a/filesystem/usr/lib/systemd/system/tizen-runtime.target b/filesystem/usr/lib/systemd/system/tizen-runtime.target
new file mode 100644 (file)
index 0000000..b1bc216
--- /dev/null
+++ b/filesystem/usr/lib/systemd/system/tizen-runtime.target
@@ -0,0 +1,6 @@
+[Unit]
+Description=Tizen Runtime
+Requires=basic.target tizen-boot.target tizen-system.target
+Conflicts=rescue.service rescue.target
+After=basic.target tizen-boot.target tizen-system.target rescue.service rescue.target
+Before=multi-user.target

diff --git a/filesystem/usr/lib/systemd/system/tizen-system.target b/filesystem/usr/lib/systemd/system/tizen-system.target
new file mode 100644 (file)
index 0000000..4240819
--- /dev/null
+++ b/filesystem/usr/lib/systemd/system/tizen-system.target
@@ -0,0 +1,6 @@
+[Unit]
+Description=Tizen System
+Requires=basic.target tizen-boot.target
+Conflicts=rescue.service rescue.target
+After=basic.target tizen-boot.target rescue.service rescue.target
+Before=multi-user.target

diff --git a/filesystem/usr/lib/udev/rules.d/51-tizen-udev-default.rules b/filesystem/usr/lib/udev/rules.d/51-tizen-udev-default.rules
new file mode 100644 (file)
index 0000000..ed45cb6
--- /dev/null
+++ b/filesystem/usr/lib/udev/rules.d/51-tizen-udev-default.rules
@@ -0,0 +1,22 @@
+# Tizen specific additional rules
+
+SUBSYSTEM=="tty", KERNEL=="ptmx", SECLABEL{smack}="*"
+SUBSYSTEM=="tty", KERNEL=="tty", SECLABEL{smack}="*"
+SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", SECLABEL{smack}="*"
+SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", SECLABEL{smack}="*"
+KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", SECLABEL{smack}="*"
+
+# input
+SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", GROUP="input", MODE="0660"
+
+# video
+KERNEL=="mali", GROUP="video", SECLABEL{smack}="*"
+KERNEL=="slp_global_lock", GROUP="video", SECLABEL{smack}="*"
+SUBSYSTEM=="video4linux", SECLABEL{smack}="*"
+SUBSYSTEM=="drm", SECLABEL{smack}="*"
+
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", SECLABEL{smack}="*"
+
+KERNEL=="fuse", SECLABEL{smack}="*"
+
+LABEL="tizen_default_permissions_end"

diff --git a/filesystem/usr/lib/udev/rules.d/95-tizen-emulator.rules b/filesystem/usr/lib/udev/rules.d/95-tizen-emulator.rules
index 019c341..18b3fae 100644 (file)
--- a/filesystem/usr/lib/udev/rules.d/95-tizen-emulator.rules
+++ b/filesystem/usr/lib/udev/rules.d/95-tizen-emulator.rules
@@ -1,14 +1,16 @@
-KERNEL=="glmem",        MODE="0666", SMACK="*"
-KERNEL=="yagl",         MODE="0666", SMACK="*"
-KERNEL=="esm",          MODE="0666", SMACK="*"
+KERNEL=="glmem",        MODE="0666", SECLABEL{smack}="*"
+KERNEL=="yagl",         MODE="0666", SECLABEL{smack}="*"
+KERNEL=="esm",          MODE="0666", SECLABEL{smack}="*"
 
-KERNEL=="brillcodec",   GROUP="hwcodec", MODE="0666", SMACK="*"
+KERNEL=="brillcodec",   GROUP="hwcodec", MODE="0666", SECLABEL{smack}="*"
 
-KERNEL=="video0",       GROUP="camera", MODE="0660", SMACK="device::camera"
-KERNEL=="video1",       GROUP="video", MODE="0660", SMACK="device::video"
-KERNEL=="video2",       GROUP="video", MODE="0660", SMACK="device::video"
+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}="*"

diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index d07945c..29f25fc 100644 (file)
--- a/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@ -1,5 +1,5 @@
 Name: system-plugin-emulator
-Version: 0.1.1
+Version: 0.1.5
 Release: 1
 
 %define systemd_dir     /usr/lib/systemd
@@ -13,6 +13,7 @@ Requires(post): setup
 Requires(post): coreutils
 Source0: %{name}-%{version}.tar.gz
 Source1001: packaging/%{name}.manifest
+ExclusiveArch: %{ix86}
 
 %description
 System plugin files for emulator
@@ -31,7 +32,6 @@ cp -arf filesystem/* %{buildroot}
 if [ ! -d %{buildroot}/etc/rc.d/rc3.d ]; then
     mkdir -p %{buildroot}/etc/rc.d/rc3.d
 fi
-ln -s /etc/init.d/setup-audio-volume %{buildroot}//etc/rc.d/rc3.d/S02setup-audio-volume
 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
 
@@ -46,14 +46,12 @@ ln -s %{systemd_dir}/system/emul-common-preinit.service %{buildroot}/%{systemd_d
 # 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/
+ln -s %{systemd_dir}/system/tizen-boot.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/
+ln -s %{systemd_dir}/system/tizen-system.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/
+ln -s %{systemd_dir}/system/tizen-runtime.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/
 mkdir -p %{buildroot}/%{systemd_dir}/system/emulator.target.wants
-
 # services from system-plugin-exynos
-%if "%{_repository}" == "wearable"
 ln -s ../tizen-generate-env.service %{buildroot}/%{systemd_dir}/system/basic.target.wants/
-%else
-rm %{buildroot}/%{systemd_dir}/system/tizen-generate-env.service
-%endif
 mkdir -p %{buildroot}/%{systemd_dir}/system/default.target.wants
 ln -s ../tizen-readahead-collect.service %{buildroot}/%{systemd_dir}/system/default.target.wants/
 ln -s ../tizen-readahead-replay.service %{buildroot}/%{systemd_dir}/system/default.target.wants/
@@ -71,18 +69,21 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 %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
@@ -92,32 +93,34 @@ fi
 /etc/rc.d/rc.firstboot
 /etc/rc.d/rc.shutdown
 /etc/rc.d/rc.sysinit
-/etc/rc.d/rc3.d/S02setup-audio-volume
 /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
 /usr/lib/systemd/system/basic.target.wants/emulator_preinit.target
-%if "%{_repository}" == "wearable"
 /usr/lib/systemd/system/basic.target.wants/tizen-generate-env.service
-%endif
 /usr/lib/systemd/system/default.target.wants/tizen-readahead-collect.service
 /usr/lib/systemd/system/default.target.wants/tizen-readahead-replay.service
 /usr/lib/systemd/system/multi-user.target.wants/emulator.target
+/usr/lib/systemd/system/multi-user.target.wants/tizen-boot.target
+/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/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/tizen-boot.target
+/usr/lib/systemd/system/tizen-system.target
+/usr/lib/systemd/system/tizen-runtime.target
 /usr/lib/systemd/system/tizen-boot.target.wants/wm_ready.service
-%if "%{_repository}" == "wearable"
-/usr/lib/systemd/system/tizen-generate-env.service
-%endif
 /usr/lib/systemd/system/tizen-readahead-collect.service
 /usr/lib/systemd/system/tizen-readahead-replay.service
 /usr/lib/systemd/system/wm_ready.service
+/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}