X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fnet-config.spec;h=55baacf9fdefb840f5d35b6f7bff752d9e68022f;hb=38bb27bf65ccebbf5fc3a90f21d5357d1c68b33a;hp=930b9970cb3ac0517314882a70d2cf36ce4fcdee;hpb=235ad9776517a4320ced81fafea2924910c76fdf;p=platform%2Fcore%2Fconnectivity%2Fnet-config.git

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 930b997..55baacf 100755
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,7 +1,7 @@
 Name:		net-config
 Summary:	TIZEN Network Configuration service
-Version:	1.1.141
-Release:	3
+Version:	1.2.14
+Release:	1
 Group:		System/Network
 License:	Apache-2.0
 Source0:	%{name}-%{version}.tar.gz
@@ -15,7 +15,10 @@ BuildRequires:	cmake
 BuildRequires:	pkgconfig(sqlite3)
 BuildRequires:	pkgconfig(libtzplatform-config)
 BuildRequires:	pkgconfig(key-manager)
-BuildRequires:	pkgconfig(libnl-2.0)
+BuildRequires:	pkgconfig(libnl-3.0)
+BuildRequires:	pkgconfig(libnl-genl-3.0)
+BuildRequires:  pkgconfig(hal-api-wifi)
+BuildRequires:	pkgconfig(libcurl)
 Requires:		vconf
 Requires:		connman
 Requires:		systemd
@@ -30,6 +33,7 @@ Provides:       %{name}-profile_common = %{version}-%{release}
 Provides:       %{name}-profile_mobile = %{version}-%{release}
 Provides:       %{name}-profile_wearable = %{version}-%{release}
 Provides:       %{name}-profile_ivi = %{version}-%{release}
+Provides:       %{name}-profile_robot = %{version}-%{release}
 
 %description
 TIZEN Network Configuration service
@@ -46,6 +50,12 @@ Requires:       %{name} = %{version}-%{release}
 %description profile_wearable
 TIZEN Network Configuration service extension for Tizen wearable profile.
 
+%package profile_robot
+Summary:        net-config extension for robot profile
+Requires:       %{name} = %{version}-%{release}
+%description profile_robot
+TIZEN Network Configuration service extension for Tizen robot profile.
+
 %package plugin-headed
 Summary:        net-config extension for headed profile
 BuildRequires:	pkgconfig(bundle)
@@ -64,6 +74,19 @@ Requires:       %{name} = %{version}-%{release}
 %description plugin-telephony
 TIZEN Network Configuration service extension for telephony FW.
 
+%package plugin-stc
+Summary:        net-config extension for STC FW
+BuildRequires:	pkgconfig(capi-network-stc)
+Requires:       %{name} = %{version}-%{release}
+%description plugin-stc
+TIZEN Network Configuration service extension for STC FW.
+
+%package plugin-battery
+Summary:        net-config extension for battery FW
+Requires:       %{name} = %{version}-%{release}
+%description plugin-battery
+TIZEN Network Configuration service extension for battery FW.
+
 %package haltests
 Summary:        net-config extension for HAL test
 BuildRequires:	pkgconfig(gmock)
@@ -74,6 +97,16 @@ Requires:       %{name} = %{version}-%{release}
 %description haltests
 TIZEN Network Configuration service extension for HAL test.
 
+%ifarch arm armv7l aarch64
+%package plugin-online-monitor
+Summary:        net-config extension for advanced online monitoring
+BuildRequires:  pkgconfig(libbpf)
+Requires:       libbpf
+Requires:       %{name} = %{version}-%{release}
+%description plugin-online-monitor
+TIZEN Network Configuration service extension for advanced online monitoring.
+%endif
+
 %prep
 %setup -q
 
@@ -85,6 +118,12 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DTIZEN_DEBUG_ENABLE=0 \
 	-DTIZEN_WEARABLE=1 \
 	-DTIZEN_CAPTIVE_PORTAL=1 \
+%if "%{?_lib}" == "lib64"
+	-DTIZEN_ARCH_64=1 \
+%endif
+%ifarch arm armv7l aarch64
+	-DTIZEN_ARM_ARCH=1 \
+%endif
 	-DLIB_PATH=%{_lib} \
 	-DBIN_DIR=%{_bindir} \
 	-DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} \
@@ -104,6 +143,9 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DTIZEN_DEBUG_ENABLE=0 \
 	-DTIZEN_WEARABLE=0 \
 	-DTIZEN_CAPTIVE_PORTAL=0 \
+%if "%{?_lib}" == "lib64"
+	-DTIZEN_ARCH_64=1 \
+%endif
 	-DLIB_PATH=%{_lib} \
 	-DBIN_DIR=%{_bindir} \
 	-DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} \
@@ -112,33 +154,24 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 
 make %{?_smp_mflags}
 
-
 %install
 %make_install
 
+#Settings file
+mkdir -p %{buildroot}/%{_localstatedir}/lib/net-config
+cp resources/var/lib/net-config/settings %{buildroot}/%{_localstatedir}/lib/net-config/settings
+cp resources/var/lib/net-config/settings-robot %{buildroot}/%{_localstatedir}/lib/net-config/settings-robot
+
 #Systemd service file
-mkdir -p %{buildroot}%{_libdir}/systemd/system/
-%if "%{?_lib}" == "lib64"
 mkdir -p %{buildroot}%{_unitdir}
-%endif
 
-cp resources/usr/lib/systemd/system/net-config_tv.service %{buildroot}%{_libdir}/systemd/system/net-config.service.tv
 mkdir -p %{buildroot}%{_libdir}/udev/rules.d/
 cp resources/usr/lib/udev/rules.d/99-wifiusb-dev.rules %{buildroot}%{_libdir}/udev/rules.d/99-wifiusb-dev.rules
-%if "%{?_lib}" == "lib64"
 cp resources/usr/lib/systemd/system/net-config_tv.service %{buildroot}%{_unitdir}/net-config.service.tv
-%endif
-cp resources/usr/lib/systemd/system/net-config.service %{buildroot}%{_libdir}/systemd/system/net-config.service
-%if "%{?_lib}" == "lib64"
 cp resources/usr/lib/systemd/system/net-config.service %{buildroot}%{_unitdir}/net-config.service
-%endif
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/
-ln -s ../net-config.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/net-config.service
-%if "%{?_lib}" == "lib64"
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants/
 ln -s ../net-config.service %{buildroot}%{_unitdir}/multi-user.target.wants/net-config.service
-%endif
 
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
 cp resources/usr/share/dbus-1/system-services/net.netconfig.service %{buildroot}%{_datadir}/dbus-1/system-services/net.netconfig.service
@@ -152,11 +185,11 @@ ln -s %{TZ_SYS_ETC}/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf
 #DBus DAC (net-config.manifest enables DBus SMACK)
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 cp resources/etc/dbus-1/system.d/net-config.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/net-config.conf
+cp resources/etc/dbus-1/system.d/net-config-robot.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/net-config-robot.conf
 
 #log dump
 mkdir -p %{buildroot}/opt/etc/dump.d/module.d/
 cp resources/opt/etc/dump.d/module.d/network_dump.sh %{buildroot}/opt/etc/dump.d/module.d/network_dump.sh
-cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}/opt/etc/dump.d/module.d/network_log_dump.sh
 mkdir -p %{buildroot}/opt/var/lib/net-config/
 cp resources/opt/etc/dump.d/module.d/network_dump.sh %{buildroot}/opt/var/lib/net-config/network_dump.sh
 cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}/opt/var/lib/net-config/network_log_dump.sh
@@ -167,6 +200,14 @@ cp resources/usr/system/RestoreDir/softreset/network_softreset.sh %{buildroot}/u
 
 mv %{_builddir}/%{name}-%{version}/net-config.wearable %{buildroot}%{_bindir}
 
+%ifarch arm armv7l aarch64
+#online-monitor
+cp plugin/online-monitor/online_monitor.conf %{buildroot}/%{_localstatedir}/lib/net-config
+cp plugin/online-monitor/common_info_dump.sh %{buildroot}/opt/var/lib/net-config/
+cp plugin/online-monitor/supp_log_dump.sh %{buildroot}/opt/var/lib/net-config/
+cp plugin/online-monitor/bpf_code %{buildroot}/opt/var/lib/net-config/
+%endif
+
 %post
 chsmack -a 'System::Shared' %{_sysconfdir}/resolv.conf
 chsmack -a 'System::Shared' %{TZ_SYS_ETC}/resolv.conf
@@ -177,13 +218,6 @@ chmod 755 /opt/usr/data/network
 chown network_fw:network_fw /opt/usr/data/network
 #chsmack -a 'System' /opt/usr/data/network
 
-#Add net-config.service to systemd extra default dependency ignore list
-mkdir -p %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
-ln -sf %{_libdir}/systemd/system/net-config.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
-%if "%{?_lib}" == "lib64"
-ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
-%endif
-
 #systemctl daemon-reload
 #systemctl restart net-config.service
 
@@ -196,39 +230,29 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 
 %files
 %manifest net-config.manifest
-%attr(500,network_fw,network_fw) %{_bindir}/*
-%exclude %{_bindir}/net-config.wearable
+%attr(500,network_fw,network_fw) %{_bindir}/net-config
 %attr(644,network_fw,network_fw) %{_sysconfdir}/resolv.conf
 %attr(644,network_fw,network_fw) %{TZ_SYS_ETC}/resolv.conf
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
 #DBus DAC
 %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*
-%attr(644,root,root) %{_libdir}/systemd/system/net-config.service
-%attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/net-config.service
+%exclude %{_sysconfdir}/dbus-1/system.d/net-config-robot.conf
 %attr(644,root,root) /usr/lib/tmpfiles.d/security-network-config.conf
-%if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/net-config.service
 %attr(644,root,root) %{_unitdir}/multi-user.target.wants/net-config.service
-%endif
+%attr(644,root,root) /var/lib/net-config/settings
 %license LICENSE
 %attr(750,network_fw,network_fw) /opt/etc/dump.d/module.d/network_dump.sh
 %attr(750,network_fw,network_fw) /opt/var/lib/net-config/network_dump.sh
-%attr(750,network_fw,network_fw) /opt/etc/dump.d/module.d/network_log_dump.sh
 %attr(750,network_fw,network_fw) /opt/var/lib/net-config/network_log_dump.sh
 
 #### tv profile ####
 %post profile_tv
-mv %{_libdir}/systemd/system/net-config.service.tv %{_libdir}/systemd/system/net-config.service
-%if "%{?_lib}" == "lib64"
 mv %{_unitdir}/net-config.service.tv %{_unitdir}/net-config.service
-%endif
 
 %files profile_tv
 %attr(644,root,root) %{_libdir}/udev/rules.d/99-wifiusb-dev.rules
-%attr(644,root,root) %{_libdir}/systemd/system/net-config.service.tv
-%if "%{?_lib}" == "lib64"
 %attr(644,root,root) %{_unitdir}/net-config.service.tv
-%endif
 
 #### wearable profile ####
 %preun profile_wearable
@@ -242,6 +266,17 @@ mv net-config.wearable net-config
 %attr(500,network_fw,network_fw) %{_bindir}/net-config.wearable
 %attr(644,network_fw,network_fw) /usr/system/RestoreDir/softreset/network_softreset.sh
 
+#### robot profile ####
+%post profile_robot
+mv /var/lib/net-config/settings-robot /var/lib/net-config/settings
+mv %{_sysconfdir}/dbus-1/system.d/net-config-robot.conf %{_sysconfdir}/dbus-1/system.d/net-config.conf
+
+%files profile_robot
+%manifest net-config.manifest
+%attr(644,root,root) /var/lib/net-config/settings-robot
+%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/net-config-robot.conf
+
+
 #### plugin ####
 %files plugin-headed
 %manifest net-config.manifest
@@ -251,7 +286,27 @@ mv net-config.wearable net-config
 %manifest net-config.manifest
 %attr(500,network_fw,network_fw) %{_libdir}/net-config-plugin-telephony.so
 
+%files plugin-stc
+%manifest net-config.manifest
+%attr(500,network_fw,network_fw) %{_libdir}/net-config-plugin-stc.so
+
+%files plugin-battery
+%manifest net-config.manifest
+%attr(500,network_fw,network_fw) %{_libdir}/net-config-plugin-battery.so
+
 %files haltests
 %manifest net-config.manifest
-%{_bindir}/*haltests
+%{_bindir}/hal/*haltests
 
+%ifarch arm armv7l aarch64
+%files plugin-online-monitor
+%manifest net-config.manifest
+%attr(500,network_fw,network_fw) %{_libdir}/net-config-plugin-online-monitor.so
+%attr(644,root,root) %{_localstatedir}/lib/net-config/online_monitor.conf
+%attr(750,network_fw,network_fw) /opt/var/lib/net-config/common_info_dump.sh
+%attr(750,network_fw,network_fw) /opt/var/lib/net-config/supp_log_dump.sh
+%attr(640,network_fw,network_fw) /opt/var/lib/net-config/bpf_code
+
+%post plugin-online-monitor
+/usr/bin/mkdir -p /opt/usr/data/network/online_mon
+%endif