Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[aarch64] Fix location of systemd unit files. Contributes to JB#50027
  • Loading branch information
mlehtima committed Jul 6, 2020
1 parent 9c8a7b4 commit 9e3200e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions rpm/nemo-qml-plugin-devicelock.spec
Expand Up @@ -61,8 +61,8 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
%qmake5_install

mkdir -p %{buildroot}/lib/systemd/system/multi-user.target.wants
ln -sf ../nemo-devicelock.socket %{buildroot}/lib/systemd/system/multi-user.target.wants/
mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
ln -sf ../nemo-devicelock.socket %{buildroot}%{_unitdir}/multi-user.target.wants/

%post -p /sbin/ldconfig

Expand All @@ -75,14 +75,14 @@ ln -sf ../nemo-devicelock.socket %{buildroot}/lib/systemd/system/multi-user.targ
%{_libdir}/qt5/qml/org/nemomobile/devicelock/libnemodevicelockplugin.so
%{_libdir}/qt5/qml/org/nemomobile/devicelock/plugins.qmltypes
%{_libdir}/qt5/qml/org/nemomobile/devicelock/qmldir
/lib/systemd/system/nemo-devicelock.socket
/lib/systemd/system/multi-user.target.wants/nemo-devicelock.socket
%{_unitdir}/nemo-devicelock.socket
%{_unitdir}/multi-user.target.wants/nemo-devicelock.socket
%config %{_sysconfdir}/dbus-1/system.d/org.nemomobile.devicelock.conf

%files -n nemo-devicelock-daemon-cli
%defattr(-,root,root,-)
%{_libexecdir}/nemo-devicelock
/lib/systemd/system/nemo-devicelock.service
%{_unitdir}/nemo-devicelock.service

%files devel
%defattr(-,root,root,-)
Expand Down
2 changes: 1 addition & 1 deletion src/daemon/daemon.pro
Expand Up @@ -37,7 +37,7 @@ target.path = /usr/libexec

systemd.files = \
systemd/nemo-devicelock.service
systemd.path= /lib/systemd/system
systemd.path= /usr/lib/systemd/system

INSTALLS += \
systemd \
Expand Down
2 changes: 1 addition & 1 deletion systemd/systemd.pri
@@ -1,7 +1,7 @@

systemd.files = \
$$PWD/nemo-devicelock.socket
systemd.path= /lib/systemd/system
systemd.path= /usr/lib/systemd/system

policy.files = \
$$PWD/org.nemomobile.devicelock.conf
Expand Down

0 comments on commit 9e3200e

Please sign in to comment.