projects
/
platform
/
upstream
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
be67345
)
Enable ConnMan NTP configurable in spec file
author
Zhang zhengguang
<zhengguang.zhang@intel.com>
Fri, 4 Jul 2014 06:33:55 +0000
(14:33 +0800)
committer
Zhang zhengguang
<zhengguang.zhang@intel.com>
Thu, 17 Jul 2014 05:01:05 +0000
(13:01 +0800)
packaging/connman.spec
patch
|
blob
|
history
diff --git
a/packaging/connman.spec
b/packaging/connman.spec
index
0f3c010
..
e8bfdad
100644
(file)
--- a/
packaging/connman.spec
+++ b/
packaging/connman.spec
@@
-1,3
+1,5
@@
+%bcond_with connman_ntp
+
Name: connman
Version: 1.24
Release: 1
Name: connman
Version: 1.24
Release: 1
@@
-6,6
+8,8
@@
Summary: Connection Manager
Url: http://connman.net
Group: Network & Connectivity/Connection Management
Source0: %{name}-%{version}.tar.gz
Url: http://connman.net
Group: Network & Connectivity/Connection Management
Source0: %{name}-%{version}.tar.gz
+Source10: 40-connman-ntp.list
+Source11: connman-ntp.service
Source1001: connman.manifest
BuildRequires: systemd
BuildRequires: pkgconfig(dbus-1)
Source1001: connman.manifest
BuildRequires: systemd
BuildRequires: pkgconfig(dbus-1)
@@
-62,6
+66,14
@@
make %{?_smp_mflags}
%install
%make_install
%install
%make_install
+%if %{with connman_ntp}
+mkdir -p %{buildroot}/usr/lib/systemd/ntp-units.d
+install -m644 %{SOURCE10} %{buildroot}/usr/lib/systemd/ntp-units.d
+install -m644 %{SOURCE11} %{buildroot}%{_unitdir}
+%install_service network.target.wants connman-ntp.service
+%install_service multi-user.target.wants connman-ntp.service
+%endif
+
mkdir -p %{buildroot}%{_sysconfdir}/connman
cp src/main.conf %{buildroot}%{_sysconfdir}/connman/main.conf
mkdir -p %{buildroot}%{_sysconfdir}/connman
cp src/main.conf %{buildroot}%{_sysconfdir}/connman/main.conf
@@
-89,6
+101,13
@@
systemctl daemon-reload
%{_unitdir}/connman.service
%{_unitdir}/network.target.wants/connman.service
%{_unitdir}/multi-user.target.wants/connman.service
%{_unitdir}/connman.service
%{_unitdir}/network.target.wants/connman.service
%{_unitdir}/multi-user.target.wants/connman.service
+%if %{with connman_ntp}
+%dir /usr/lib/systemd/ntp-units.d
+%{_unitdir}/connman-ntp.service
+%{_unitdir}/multi-user.target.wants/connman-ntp.service
+%{_unitdir}/network.target.wants/connman-ntp.service
+/usr/lib/systemd/ntp-units.d/40-connman-ntp.list
+%endif
%files test
%manifest %{name}.manifest
%files test
%manifest %{name}.manifest