From 66aa01126732d54b9156f528f10d491abaa2ede7 Mon Sep 17 00:00:00 2001 From: Sangho Park Date: Wed, 13 May 2015 16:22:41 +0900 Subject: [PATCH] Revert "Merge branch 'spin-develop' into tizen" This reverts commit 35eb64714feb7dc58affc0a8e9e74da4a8d20adc, reversing changes made to ff58b3c839a627da9d2e894df78fd8b699123e20. Change-Id: I178baeb2e834a0aa102e5d1296fd1b54edd4f44e Signed-off-by: Sangho Park --- AUTHORS | 2 + LICENSE | 412 +++++++++--------- NOTICE | 2 +- filesystem/etc/emulator/model-config.sh | 57 --- .../etc/emulator/select-boot-animation.sh | 24 - filesystem/etc/inittab | 0 filesystem/etc/profile.d/proxy_setting.sh | 59 ++- filesystem/etc/rc.d/rc.sysinit | 147 ------- .../default-extra-dependencies/ignore-units | 40 -- .../system/emul-common-preinit.service | 8 +- .../system/emul-setup-audio-volume.service | 5 +- .../usr/lib/systemd/system/tizen-boot.target | 6 - .../systemd/system/tizen-generate-env.service | 12 - .../system/tizen-readahead-collect.service | 17 - .../system/tizen-readahead-replay.service | 16 - .../lib/systemd/system/tizen-runtime.target | 6 - .../lib/systemd/system/tizen-system.target | 6 - .../usr/lib/systemd/system/wm_ready.service | 12 - .../udev/rules.d/51-tizen-udev-default.rules | 22 - .../lib/udev/rules.d/95-tizen-emulator.rules | 10 +- packaging/system-plugin-emulator.changes | 8 +- packaging/system-plugin-emulator.spec | 66 ++- 22 files changed, 273 insertions(+), 664 deletions(-) delete mode 100755 filesystem/etc/emulator/model-config.sh delete mode 100755 filesystem/etc/emulator/select-boot-animation.sh mode change 100644 => 100755 filesystem/etc/inittab delete mode 100644 filesystem/etc/systemd/default-extra-dependencies/ignore-units delete mode 100644 filesystem/usr/lib/systemd/system/tizen-boot.target delete mode 100644 filesystem/usr/lib/systemd/system/tizen-generate-env.service delete mode 100644 filesystem/usr/lib/systemd/system/tizen-readahead-collect.service delete mode 100644 filesystem/usr/lib/systemd/system/tizen-readahead-replay.service delete mode 100644 filesystem/usr/lib/systemd/system/tizen-runtime.target delete mode 100644 filesystem/usr/lib/systemd/system/tizen-system.target delete mode 100644 filesystem/usr/lib/systemd/system/wm_ready.service delete mode 100644 filesystem/usr/lib/udev/rules.d/51-tizen-udev-default.rules diff --git a/AUTHORS b/AUTHORS index c9d544d..978df0f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,7 @@ YeongKyoon Lee +DaiYoung Kim SeokYeon Hwang +SangJin Kim KiTae Kim JinHyung Jo SungMin Ha diff --git a/LICENSE b/LICENSE index f94008a..bbe9d02 100644 --- a/LICENSE +++ b/LICENSE @@ -1,206 +1,206 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + diff --git a/NOTICE b/NOTICE index 4297ee3..f085dc6 100644 --- a/NOTICE +++ b/NOTICE @@ -1 +1 @@ -Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. diff --git a/filesystem/etc/emulator/model-config.sh b/filesystem/etc/emulator/model-config.sh deleted file mode 100755 index 96a29e1..0000000 --- a/filesystem/etc/emulator/model-config.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -CMDLINE=/proc/cmdline -XML=/etc/config/model-config.xml - - -echo -e "[${_G} model config setting ${C_}]" - -# display resolution -if grep --silent "video=" $CMDLINE ; then - echo -e "[${_G} modify the resolution value of platform features: ${C_}]" - - VIDEO=`sed s/.*video=// $CMDLINE | cut -d ' ' -f1` - FORMAT=`echo $VIDEO | cut -d ':' -f2 | cut -d ',' -f2` - RESOLUTION=`echo $FORMAT | cut -d '-' -f1` - WIDTH=`echo $RESOLUTION | cut -d 'x' -f1` - HEIGHT=`echo $RESOLUTION | cut -d 'x' -f2` - - TR_NUM=`echo $WIDTH$HEIGHT | tr -d '[0-9]'` - if [ "$TR_NUM" != "" ] ; then - echo "non-integer argument" - else - WIDTH_KEY="tizen.org\/feature\/screen.width\" type=\"int\"" - sed -i s/"$WIDTH_KEY".*\"$WIDTH"\"$HEIGHT"\true\"$SCREEN_DPI"\ /proc/sys/kernel/core_pattern - ulimit -c unlimited -else - echo "core dump disabled" - ulimit -c 0 -fi - -echo -e "[${_G}run profile${C_}]" -# Run profile -. /etc/profile - -# Check rw mode -DEVEL_UPDATE_MODE=`grep devel_update_boot /proc/cmdline` -if [ -f /opt/etc/.devel_update ] && [ -z "$DEVEL_UPDATE_MODE" ]; then - touch /opt/etc/.hib_capturing - rm /opt/etc/.devel_update -fi - -#for emulator -echo -e "[${_G}make symbolic link for i686${C_}]" -cd /usr/lib/enlightenment/modules/comp-slp/ -ln -s linux-gnu-i686-ver-pre-svn-08 linux-gnu-i486-ver-pre-svn-08 -cd /usr/lib/enlightenment/modules/e17-extra-module-keyrouter/ -ln -s linux-gnu-i686-ver-pre-svn-08 linux-gnu-i486-ver-pre-svn-08 -cd /usr/lib/enlightenment/modules/e17-extra-module-wmready/ -ln -s linux-gnu-i686-ver-pre-svn-08 linux-gnu-i486-ver-pre-svn-08 -cd /usr/lib/enlightenment/modules/illume2-slp/ -ln -s linux-gnu-i686-ver-pre-svn-08 linux-gnu-i486-ver-pre-svn-08 -cd /usr/lib/edje/modules/icon_calendar/ -ln -s linux-gnu-i686-1.0.0 linux-gnu-i486-1.0.0 - -#for emulator : where is press binary? -/usr/bin/press 1 # wait input to stop running scripts -if [ $? -eq 0 ]; then - echo "script is stopped" - # prepare usbnet before exit - insmod /opt/driver/g_ether.ko - sleep 1 - ifconfig usb0 192.168.129.3 netmask 255.255.255.0 - # Run all rc0 scripts - for i in /etc/rc.d/rc0.d/*; do - echo -e "[${_G}${i} start${C_}]" - $i start - done -elif [ -f /opt/etc/.hib_capturing ] && [ -z "$DEVEL_UPDATE_MODE" ]; then - echo -e "[${_Y}run all rc4 scripts${C_}]" - # Run all rc4 scripts - /usr/bin/write-to-lcd /dev/fb3 "Initializing daemons" - echo "there is /opt/etc/.hib_capturing hibernation capturing mode" - for i in /etc/rc.d/rc4.d/*; do - echo -e "[${_G}${i} start${C_}]" - $i start - done -else - # Run all rc3 scripts - echo -e "[${_G}run all rc3 scripts${C_}]" - echo "normal boot" - # modify script for checking boot up progress... - NUMBER_OF_RCS=`ls /etc/rc.d/rc3.d/ | wc -l` - count=0; - for i in /etc/rc.d/rc3.d/*; do - echo -e "[${_G}${i} start${C_}]" - $i start - count=$((count + 1)) - echo `expr $count \* 100 / $NUMBER_OF_RCS` > /dev/esm - done -fi - - -# symbolic link -if [ ! -e /opt/apps ]; then - echo -e "[${_G}link /opt/apps -> /opt/media/apps${C_}]" - ln -s /opt/media/apps /opt/apps -fi - -# inhouse home-directory -chown 5000:5000 /home/inhouse - -if [ "$DEVEL_UPDATE_MODE" ]; then - touch /opt/etc/.devel_update -fi #for emulator : /etc/rc.d/rc.emul diff --git a/filesystem/etc/systemd/default-extra-dependencies/ignore-units b/filesystem/etc/systemd/default-extra-dependencies/ignore-units deleted file mode 100644 index df8bd62..0000000 --- a/filesystem/etc/systemd/default-extra-dependencies/ignore-units +++ /dev/null @@ -1,40 +0,0 @@ -ac.service -alarm-server.service -boot-osp.service -check-mount.service -crash-daemon.service -csc-starter.service -dbus.service -factory-pretest.service -factory-reset.service -immvibed.service -indicator.service -irsc_util.service -launchpad-preload.service -messagebus.service -ode-server.service -opt-usr-fsck.service -osp-tmpdir-setup.service -pkgmgr_recovery.service -power_qcom_init.service -pulseaudio.service -qmuxd.service -qseecom_ready.service -recovery-update.service -reset-verify.service -rmt_storage.service -samsung-secure-storage.service -secure-storage.service -security-server.service -slp-pkgmgr.service -smack-rules.service -sound-server.service -starter.service -system-server.service -tee-qsee.service -telephony-daemon.service -time.service -trm.service -wifi-module-check.service -wm_ready.service -wrt-security-daemon.service diff --git a/filesystem/usr/lib/systemd/system/emul-common-preinit.service b/filesystem/usr/lib/systemd/system/emul-common-preinit.service index 641bdb1..dd5e101 100644 --- a/filesystem/usr/lib/systemd/system/emul-common-preinit.service +++ b/filesystem/usr/lib/systemd/system/emul-common-preinit.service @@ -7,10 +7,10 @@ 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. +# but we execute it again for sure. +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-setup-audio-volume.service b/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service index 351d420..f930330 100644 --- a/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service +++ b/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service @@ -4,10 +4,7 @@ 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=/etc/emulator/setup-audio-volume.sh [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 deleted file mode 100644 index 1533be5..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-boot.target +++ /dev/null @@ -1,6 +0,0 @@ -[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-generate-env.service b/filesystem/usr/lib/systemd/system/tizen-generate-env.service deleted file mode 100644 index 7e860a5..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-generate-env.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Generate environment from /etc/profile.d -DefaultDependencies=no -After=opt.mount -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' - -[Install] -WantedBy=basic.target diff --git a/filesystem/usr/lib/systemd/system/tizen-readahead-collect.service b/filesystem/usr/lib/systemd/system/tizen-readahead-collect.service deleted file mode 100644 index dc37903..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-readahead-collect.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Collect Read-Ahead Data -DefaultDependencies=no -Conflicts=shutdown.target -After=smack.service smack_pre_labeling_priv.service -Before=sysinit.target shutdown.target -ConditionPathExists=/opt/etc/.vconf_labeling -ConditionPathExists=!/opt/.readahead - -[Service] -Type=notify -ExecStart=/usr/lib/systemd/systemd-readahead collect --timeout=6s --savedir=/opt -RemainAfterExit=yes -StandardOutput=null - -[Install] -WantedBy=default.target diff --git a/filesystem/usr/lib/systemd/system/tizen-readahead-replay.service b/filesystem/usr/lib/systemd/system/tizen-readahead-replay.service deleted file mode 100644 index 4ec17be..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-readahead-replay.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Replay Read-Ahead Data -DefaultDependencies=no -Conflicts=shutdown.target -After=smack.service smack_pre_labeling_priv.service -Before=sysinit.target shutdown.target -ConditionPathExists=/opt/.readahead - -[Service] -Type=notify -ExecStart=/usr/lib/systemd/systemd-readahead replay --savedir=/opt -RemainAfterExit=yes -StandardOutput=null - -[Install] -WantedBy=default.target diff --git a/filesystem/usr/lib/systemd/system/tizen-runtime.target b/filesystem/usr/lib/systemd/system/tizen-runtime.target deleted file mode 100644 index b1bc216..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-runtime.target +++ /dev/null @@ -1,6 +0,0 @@ -[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 deleted file mode 100644 index 4240819..0000000 --- a/filesystem/usr/lib/systemd/system/tizen-system.target +++ /dev/null @@ -1,6 +0,0 @@ -[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/systemd/system/wm_ready.service b/filesystem/usr/lib/systemd/system/wm_ready.service deleted file mode 100644 index 00d287f..0000000 --- a/filesystem/usr/lib/systemd/system/wm_ready.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=waiting for window mananger -After=xorg.service -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 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 deleted file mode 100644 index ed45cb6..0000000 --- a/filesystem/usr/lib/udev/rules.d/51-tizen-udev-default.rules +++ /dev/null @@ -1,22 +0,0 @@ -# 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 c95f6e7..416c21d 100644 --- a/filesystem/usr/lib/udev/rules.d/95-tizen-emulator.rules +++ b/filesystem/usr/lib/udev/rules.d/95-tizen-emulator.rules @@ -2,15 +2,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=="codec", GROUP="hwcodec", MODE="0666", SECLABEL{smack}="device::hwcodec" +KERNEL=="brillcodec", GROUP="hwcodec", MODE="0666", SECLABEL{smack}="device::hwcodec" 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}="*" +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}="*" +SUBSYSTEM=="input", ATTR{name}=="ImExPS/2 Generic Explorer Mouse", ENV{ID_SEAT}="seat1" diff --git a/packaging/system-plugin-emulator.changes b/packaging/system-plugin-emulator.changes index 6dfba30..5a2fdb6 100644 --- a/packaging/system-plugin-emulator.changes +++ b/packaging/system-plugin-emulator.changes @@ -1,8 +1,8 @@ -* Tue Nov 26 11:41:26 KST 2013 Sooyoung Ha -- modify fstab on spec file. +* Thu Jun 05 11:15:24 CEST 2014 Rafal Krypa +- remove sdbd.service since sdbd package has included the service file. -* Mon Nov 25 17:08:11 UTC 2013 Sooyoung Ha -- add some service files from system-plugin-exynos git repository. +* Thu Apr 17 18:03:11 KST 2014 Sooyoung Ha +- remove rc.sysinit script and modify udev rule. * Fri Nov 1 06:19:37 UTC 2013 GiWoong Kim - modified model-config.sh diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index c60a513..ab2dd0d 100644 --- a/packaging/system-plugin-emulator.spec +++ b/packaging/system-plugin-emulator.spec @@ -1,5 +1,5 @@ Name: system-plugin-emulator -Version: 0.1.7 +Version: 0.0.16 Release: 1 %define systemd_dir /usr/lib/systemd @@ -9,11 +9,11 @@ License: Apache-2.0 Group: System/Configuration Requires: udev Requires: util-linux +Requires: sysvinit Requires(post): setup Requires(post): coreutils Source0: %{name}-%{version}.tar.gz Source1001: packaging/%{name}.manifest -ExclusiveArch: %{ix86} %description System plugin files for emulator @@ -28,47 +28,40 @@ 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/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 + # 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-vdb.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/ -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 -ln -s ../tizen-generate-env.service %{buildroot}/%{systemd_dir}/system/basic.target.wants/ -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/ -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} -%post -#make fstab -if [ -e /etc/fstab ]; then - 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/emulator/select-boot-animation.sh +/etc/init.d/setup-audio-volume +/etc/init.d/mount-hostdir /etc/inittab /etc/preconf.d/emulator_ns.preinit /etc/preconf.d/systemd_conf.preinit @@ -77,29 +70,20 @@ fi /etc/rc.d/rc.firstboot /etc/rc.d/rc.shutdown /etc/rc.d/rc.sysinit -/etc/systemd/default-extra-dependencies/ignore-units +/etc/rc.d/rc3.d/S02setup-audio-volume +/etc/rc.d/rc3.d/S03mount-hostdir /usr/lib/systemd/system/emulator_preinit.target /usr/lib/systemd/system/emulator.target /usr/lib/systemd/system/basic.target.wants/emulator_preinit.target -/usr/lib/systemd/system/basic.target.wants/tizen-generate-env.service -/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/dev-vdb.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/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 -/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/systemd/system/emulator_preinit.target.wants/dev-vdb.swap /usr/lib/udev/rules.d/95-tizen-emulator.rules +%dir /mnt/host /usr/share/license/%{name} -- 2.34.1