From: Sunmin Lee Date: Wed, 6 Sep 2017 07:25:22 +0000 (+0900) Subject: Remove not supported update script X-Git-Tag: submit/tizen_4.0/20170906.092254^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd736335953d89148cda15aa493362eb3c2870a6;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git Remove not supported update script RW update script for Tizen 2.4 (to 3.0) is not necessary in Tizen 4.0. (Tizen 4.0 does not support upgrade from Tizen 2.4) Remove this file in terms of clearing the redundancy. Change-Id: I35b4c07d313bdaa21d777f77b196e5715adf59d6 --- diff --git a/packaging/net-config.spec b/packaging/net-config.spec index b0406bf..c204c49 100755 --- a/packaging/net-config.spec +++ b/packaging/net-config.spec @@ -25,8 +25,6 @@ Provides: %{name}-profile_mobile = %{version}-%{release} Provides: %{name}-profile_wearable = %{version}-%{release} Provides: %{name}-profile_ivi = %{version}-%{release} -%define upgrade_script_path /usr/share/upgrade/scripts - %description TIZEN Network Configuration service @@ -124,8 +122,6 @@ cp resources/usr/share/dbus-1/system-services/net.netconfig.service %{buildroot} mkdir -p %{buildroot}%{TZ_SYS_ETC} cp resources/etc/resolv.conf %{buildroot}%{TZ_SYS_ETC}/resolv.conf -mkdir -p %{buildroot}/usr/share/upgrade/data/ -cp resources/etc/resolv.conf %{buildroot}/usr/share/upgrade/data/resolv.conf mkdir -p %{buildroot}%{_sysconfdir} ln -s %{TZ_SYS_ETC}/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf @@ -140,10 +136,6 @@ mkdir -p %{buildroot}/usr/system/RestoreDir/softreset cp resources/usr/system/RestoreDir/softreset/network_softreset.sh %{buildroot}/usr/system/RestoreDir/softreset/network_softreset.sh %endif -#OS Upgrade -mkdir -p %{buildroot}%{upgrade_script_path} -cp -f scripts/500.netconfig_upgrade.sh %{buildroot}%{upgrade_script_path} - %post chsmack -a 'System::Shared' %{_sysconfdir}/resolv.conf chsmack -a 'System::Shared' %{TZ_SYS_ETC}/resolv.conf @@ -176,7 +168,6 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen %attr(500,network_fw,network_fw) %{_bindir}/* %attr(644,network_fw,network_fw) %{_sysconfdir}/resolv.conf %attr(644,network_fw,network_fw) %{TZ_SYS_ETC}/resolv.conf -%attr(644,network_fw,network_fw) /usr/share/upgrade/data/resolv.conf %attr(644,root,root) %{_datadir}/dbus-1/system-services/* #DBus DAC %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/* @@ -191,7 +182,6 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen %if 0%{?model_build_feature_wlan_wearable} == 1 %attr(700,network_fw,network_fw) /usr/system/RestoreDir/softreset/network_softreset.sh %endif -%{upgrade_script_path}/500.netconfig_upgrade.sh %post profile_tv mv %{_libdir}/systemd/system/net-config.service.tv %{_libdir}/systemd/system/net-config.service diff --git a/scripts/500.netconfig_upgrade.sh b/scripts/500.netconfig_upgrade.sh deleted file mode 100755 index b7f7ef5..0000000 --- a/scripts/500.netconfig_upgrade.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -PATH=/bin:/usr/bin:/sbin:/usr/sbin -source /etc/tizen-platform.conf - -#-----------------------------------------------# -# netconfig patch for upgrade (2.4 -> 3.0) # -#-----------------------------------------------# - -rm -f /opt/dbspace/.wifi_offload.db -rm -f /opt/dbspace/.wifi_offload.db-journal -rm -f /opt/etc/dump.d/module.d/network_log_dump.sh -rm -f /opt/var/lib/net-config/network_dump.sh -rm -f /opt/var/lib/net-config/network_log_dump.sh -rm -rf /opt/usr/data/network - -cp /usr/share/upgrade/data/resolv.conf %{TZ_SYS_ETC}/resolv.conf -chsmack -a 'System::Shared' %{TZ_SYS_ETC}/resolv.conf