From f8475e05aab8b64c6779fd4237dceb074b4208d6 Mon Sep 17 00:00:00 2001 From: Jaehyun Kim Date: Wed, 24 Jun 2020 15:27:40 +0900 Subject: [PATCH] Change the service file path for 64bit build Change-Id: I4ae421d7428aa3d0a70f1c66fef736b5710739b2 Signed-off-by: Jaehyun Kim --- packaging/connman.spec | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/packaging/connman.spec b/packaging/connman.spec index f1385ed..275161f 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -171,7 +171,7 @@ chmod +x bootstrap --enable-test \ --enable-loopback \ --enable-ethernet \ - --with-systemdunitdir=%{_libdir}/systemd/system \ + --with-systemdunitdir=%{_unitdir} \ --enable-pie \ --disable-wispr \ --disable-backtrace \ @@ -183,36 +183,19 @@ make %{?_smp_mflags} %make_install #Systemd service file -mkdir -p %{buildroot}%{_libdir}/systemd/system/ -%if "%{?_lib}" == "lib64" mkdir -p %{buildroot}%{_unitdir} -%endif -%if "%{?_lib}" == "lib64" cp src/connman_tv.service %{buildroot}%{_unitdir}/connman.service.tv cp src/connman.service %{buildroot}%{_unitdir}/connman.service cp vpn/connman-vpn.service %{buildroot}%{_unitdir}/connman-vpn.service -%else -cp src/connman_tv.service %{buildroot}%{_libdir}/systemd/system/connman.service.tv -%endif -mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants -ln -s ../connman.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/connman.service -%if "%{?_lib}" == "lib64" mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants ln -s ../connman.service %{buildroot}%{_unitdir}/multi-user.target.wants/connman.service -%endif #Systemd socket file for DNS proxy -%if "%{?_lib}" == "lib64" cp src/connman.socket %{buildroot}%{_unitdir}/connman.socket mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants ln -s ../connman.socket %{buildroot}%{_unitdir}/sockets.target.wants/connman.socket -%else -cp src/connman.socket %{buildroot}%{_libdir}/systemd/system/connman.socket -mkdir -p %{buildroot}%{_libdir}/systemd/system/sockets.target.wants -ln -s ../connman.socket %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/connman.socket -%endif mkdir -p %{buildroot}/%{_localstatedir}/lib/connman cp resources/var/lib/connman/settings %{buildroot}/%{_localstatedir}/lib/connman/settings @@ -254,17 +237,10 @@ systemctl daemon-reload %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/* %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/*.conf -%attr(644,root,root) %{_libdir}/systemd/system/connman.service -%attr(644,root,root) %{_libdir}/systemd/system/multi-user.target.wants/connman.service -%if "%{?_lib}" == "lib64" %attr(644,root,root) %{_unitdir}/connman.service %attr(644,root,root) %{_unitdir}/multi-user.target.wants/connman.service %attr(644,root,root) %{_unitdir}/connman.socket %attr(644,root,root) %{_unitdir}/sockets.target.wants/connman.socket -%else -%attr(644,root,root) %{_libdir}/systemd/system/connman.socket -%attr(644,root,root) %{_libdir}/systemd/system/sockets.target.wants/connman.socket -%endif %license COPYING %files test @@ -310,23 +286,16 @@ systemctl daemon-reload %attr(644,root,root) %config %{_sysconfdir}/dbus-1/system.d/connman-vpn-dbus.conf %{_datadir}/dbus-1/system-services/net.connman.vpn.service %license COPYING -%attr(644,root,root) %{_libdir}/systemd/system/connman-vpn.service -%if "%{?_lib}" == "lib64" %attr(644,root,root) %{_unitdir}/connman-vpn.service %endif -%endif %post extension-tv -mv -f %{_libdir}/systemd/system/connman.service.tv %{_libdir}/systemd/system/connman.service +mv -f %{_unitdir}/connman.service.tv %{_unitdir}/connman.service mv -f %{_sysconfdir}/connman/main.conf.tv %{_sysconfdir}/connman/main.conf %files extension-tv %attr(644,network_fw,network_fw) %{_sysconfdir}/connman/main.conf.tv %license COPYING -%if "%{?_lib}" == "lib64" %attr(644,root,root) %{_unitdir}/connman.service.tv -%else -%attr(644,root,root) %{_libdir}/systemd/system/connman.service.tv -%endif %post extension-ivi mv -f %{_sysconfdir}/connman/main.conf.ivi %{_sysconfdir}/connman/main.conf %files extension-ivi -- 2.7.4