From: Jaehyun Kim Date: Thu, 11 Nov 2021 09:03:50 +0000 (+0000) Subject: Merge "Disabled in container environment" into tizen X-Git-Tag: accepted/tizen/unified/20211129.120836~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fconnman.git;a=commitdiff_plain;h=89b6f55d269a3ed507ff6b77cefeabd95760c00a;hp=eadf8381acd0e364a28b52dfcd6b0c1bbaff4733 Merge "Disabled in container environment" into tizen --- diff --git a/packaging/connman.spec b/packaging/connman.spec index b03aae5..3cb5a8f 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -43,6 +43,7 @@ Requires: security-config Provides: %{name}-profile_common = %{version}-%{release} Provides: %{name}-profile_mobile = %{version}-%{release} Provides: %{name}-profile_wearable = %{version}-%{release} +Provides: %{name}-profile_robot = %{version}-%{release} %description Connection Manager provides a daemon for managing Internet connections @@ -162,6 +163,11 @@ Requires: %{name}-extension-bpf %description extension-bpf-devel Header files and development files for BPF support +%package profile_robot +Summary: connman extension for robot profile +Requires: %{name} = %{version}-%{release} +%description profile_robot +connman extension for Tizen robot profile %prep %setup -q @@ -242,6 +248,7 @@ cp src/main.conf %{buildroot}/etc/connman/main.conf rm %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d/ cp src/connman.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/ +cp src/connman-robot.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/ %if %{with connman_vpnd} cp vpn/vpn-dbus.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf @@ -276,6 +283,7 @@ systemctl daemon-reload %attr(600,network_fw,network_fw) /%{_localstatedir}/lib/connman/settings %attr(644,root,root) %{_datadir}/dbus-1/system-services/net.connman.service %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/* +%exclude %{_sysconfdir}/dbus-1/system.d/connman-robot.conf %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*.conf %attr(644,root,root) %{_unitdir}/connman.service @@ -374,3 +382,10 @@ ln -s %{_libdir}/libbpf.so.0.2.0 %{_libdir}/libbpf.so %{_includedir}/bpf/* %license COPYING %license COPYING.LGPLv2 + +%post profile_robot +mv %{_sysconfdir}/dbus-1/system.d/connman-robot.conf %{_sysconfdir}/dbus-1/system.d/connman.conf + +%files profile_robot +%manifest %{name}.manifest +%attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/connman-robot.conf diff --git a/src/connman-robot.conf b/src/connman-robot.conf new file mode 100644 index 0000000..b089f40 --- /dev/null +++ b/src/connman-robot.conf @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +