From ea9d0ebbd87705b6d36ad280bfab4151faaa8808 Mon Sep 17 00:00:00 2001 From: Soyoung Kim Date: Tue, 13 Aug 2013 21:26:45 +0900 Subject: [PATCH] Remove wrt-preinstall-widgets.service [Issue#] N/A [Problem] Booting time is delayed too much by wrt-preinstall-widgets.service [Cause] wrt_preinstall_widgets.sh is executed several times at boot time [Solution] Remove preinstall service as we do not need this anymore. e.g.,) preinstall service is available with CSC. We received a request of removal this service from kyungmin.park@samsung.com [SCMRequest] N/A Change-Id: I3152068778565970bb4f2f2c89be12e539f4945d --- CMakeLists.txt | 1 - etc/CMakeLists.txt | 4 -- etc/DESCRIPTION | 1 - etc/wrt_preinstall_widgets.sh | 79 -------------------------------- packaging/wrt-installer.spec | 5 -- packaging/wrt-preinstall-widgets.service | 11 ----- 6 files changed, 101 deletions(-) delete mode 100644 etc/CMakeLists.txt delete mode 100644 etc/DESCRIPTION delete mode 100755 etc/wrt_preinstall_widgets.sh delete mode 100644 packaging/wrt-preinstall-widgets.service diff --git a/CMakeLists.txt b/CMakeLists.txt index 666256f..22515de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,6 @@ SET(TARGET_BACKEND_LIB "wgt") ############################# subdirectories ################################## ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(etc) ADD_SUBDIRECTORY(configuration) IF(WITH_TESTS) diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt deleted file mode 100644 index 14f19c6..0000000 --- a/etc/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -SET(ETC_DIR ${PROJECT_SOURCE_DIR}/etc) - -INSTALL(PROGRAMS ${ETC_DIR}/wrt_preinstall_widgets.sh DESTINATION /usr/bin/) - diff --git a/etc/DESCRIPTION b/etc/DESCRIPTION deleted file mode 100644 index bf6eac9..0000000 --- a/etc/DESCRIPTION +++ /dev/null @@ -1 +0,0 @@ -This directory contain confiration scripts, config files, certificates and all other data that don't fit to other directories. diff --git a/etc/wrt_preinstall_widgets.sh b/etc/wrt_preinstall_widgets.sh deleted file mode 100755 index 996d6a3..0000000 --- a/etc/wrt_preinstall_widgets.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved -# -# 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. -# - -_working_dir="/opt/usr/media/Downloads/.preinstallWidgets" -_widget_temp="/opt/share/widget/*" - -#Reinstall widget during booting -_temp_widget_path="/opt/share/widget/temp_info" - -install_widgets() { - _wgt_list=`find $_working_dir -name '*.wgt'` - install_failed=0 - for list in $_wgt_list - do - echo "Install $list" - return_string=`wrt-installer -i $list 2>&1 | grep -v plugin` - if [ "$return_string" != "${return_string/successful/}" ]; then - echo "$list widget installation success" - rm -rf $list - else - echo "$list widget installaiton failed" - install_failed=1 - fi - done - - if [ $install_failed -ne 1 ];then - echo "preinstall success" - rm -rf $_working_dir - fi -} - -restore_widget() { -#Remove temporary directory during widget installation -for file in $_widget_temp; do - if [[ -d $file && ${file#*temp_[0-9]*} != $file ]]; then - rm -rf $file - fi -done - -FILE_LIST=`ls $_temp_widget_path` - -if [ -n "$FILE_LIST" ]; then - echo "There are widgets to need reinstall." - for widget in $FILE_LIST; do - FILE_NAME=$_temp_widget_path/$widget - line=`cat $FILE_NAME` - echo "----------------------------------------------------------------" - echo "UnInstalling widget : $line ..." - return_string=`wrt-installer -up $line 2>&1 | grep -v plugin` - echo "Result $return_string" - done -else - echo "There is no reinstall widget." -fi -} - -#Plugin installation is temporary code for window SDK -/usr/bin/wrt-installer -p - -RECOVER_WIDGETS=`ls $_temp_widget_path` -if [ -n "$RECOVER_WIDGETS" ]; then - echo "Start Recover" - restore_widget -fi - -install_widgets diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec index 17e36f0..ce1a02c 100644 --- a/packaging/wrt-installer.spec +++ b/packaging/wrt-installer.spec @@ -80,10 +80,6 @@ mkdir -p %{buildroot}/usr/share/license cp LICENSE %{buildroot}/usr/share/license/%{name} %make_install -mkdir -p %{buildroot}%{_libdir}/systemd/system/tizen-runtime.target.wants -install -m 644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/wrt-preinstall-widgets.service -ln -s ../wrt-preinstall-widgets.service %{buildroot}%{_libdir}/systemd/system/tizen-runtime.target.wants/wrt-preinstall-widgets.service - %clean rm -rf %{buildroot} @@ -114,7 +110,6 @@ mkdir -p /opt/share/icons/default/small %files %manifest wrt-installer.manifest %attr(755,root,root) %{_bindir}/wrt-installer -%attr(775,root,root) %{_bindir}/wrt_preinstall_widgets.sh /usr/etc/package-manager/backendlib/libwgt.so %attr(644,root,root) /usr/etc/wrt-installer/*.xsd %{_libdir}/systemd/system/tizen-runtime.target.wants/wrt-preinstall-widgets.service diff --git a/packaging/wrt-preinstall-widgets.service b/packaging/wrt-preinstall-widgets.service deleted file mode 100644 index 0fe2781..0000000 --- a/packaging/wrt-preinstall-widgets.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=WRT Preinstall Widgets -After=tizen-runtime.target -Requires=tizen-runtime.target - -[Service] -Type=forking -ExecStart=/usr/bin/wrt_preinstall_widgets.sh - -[Install] -WantedBy=tizen-runtime.target -- 2.7.4