gh-mirrors/incus-rpm
1
0
Fork 1
mirror of https://github.com/weaselshit/incus-rpm.git synced 2025-12-10 11:31:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move libexec content to libexecdir

Browse Source
This commit is contained in:
Neal Gompa
2024-04-27 09:11:19 -04:00
parent eedc6db74f
commit 4a2d46fc8b
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
incus-startup.service
View File

@@ -6,8 +6,8 @@ Requires=incus.socket
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/usr/lib/incus/incusd activateifneeded ExecStart=/usr/libexec/incus/incusd activateifneeded
ExecStop=/usr/lib/incus/shutdown ExecStop=/usr/libexec/incus/shutdown
TimeoutStartSec=600s TimeoutStartSec=600s
TimeoutStopSec=600s TimeoutStopSec=600s
RemainAfterExit=yes RemainAfterExit=yes

2
incus-user.service
View File

@@ -4,7 +4,7 @@ After=incus-user.socket incus.service
Requires=incus-user.socket Requires=incus-user.socket
[Service] [Service]
ExecStart=/usr/lib/incus/incus-user --group incus ExecStart=/usr/libexec/incus/incus-user --group incus
Restart=on-failure Restart=on-failure
[Install] [Install]

4
incus.service
View File

@@ -7,8 +7,8 @@ Documentation=man:incusd(1)
[Service] [Service]
Environment=INCUS_DOCUMENTATION=/usr/share/doc/incus-doc/html Environment=INCUS_DOCUMENTATION=/usr/share/doc/incus-doc/html
Environment=INCUS_OVMF_PATH=/usr/share/edk2/ovmf Environment=INCUS_OVMF_PATH=/usr/share/edk2/ovmf
ExecStart=/usr/lib/incus/incusd --group incus-admin ExecStart=/usr/libexec/incus/incusd --group incus-admin
ExecStartPost=/usr/lib/incus/incusd waitready --timeout=600 ExecStartPost=/usr/libexec/incus/incusd waitready --timeout=600
KillMode=process KillMode=process
TimeoutStartSec=600s TimeoutStartSec=600s
TimeoutStopSec=30s TimeoutStopSec=30s

11
incus.spec
View File

@@ -57,7 +57,6 @@ Source203: %{swaggerui_source_baseurl}/swagger-ui.css#/swagger-ui-%{swagger
# Allow offline builds # Allow offline builds
Patch0: incus-0.2-doc-Remove-downloads-from-sphinx-build.patch Patch0: incus-0.2-doc-Remove-downloads-from-sphinx-build.patch
%global incuslibdir %{_prefix}/lib/incus
%global bashcompletiondir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || :) %global bashcompletiondir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || :)
%global selinuxtype targeted %global selinuxtype targeted
@@ -141,8 +140,7 @@ This package contains the Incus daemon.
%{_unitdir}/%{name}-startup.service %{_unitdir}/%{name}-startup.service
%{_unitdir}/%{name}-user.socket %{_unitdir}/%{name}-user.socket
%{_unitdir}/%{name}-user.service %{_unitdir}/%{name}-user.service
%dir %{incuslibdir} %{_libexecdir}/%{name}/
%{incuslibdir}/*
%{_sysusersdir}/%{name}.conf %{_sysusersdir}/%{name}.conf
%{_tmpfilesdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf
%{_mandir}/man1/incusd*.1.* %{_mandir}/man1/incusd*.1.*
@@ -422,9 +420,9 @@ install -D -m0644 -vp %{SOURCE109} %{buildroot}%{_sysctldir}/10-incus-inotify.co
install -D -m0644 -vp selinux/%{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2 install -D -m0644 -vp selinux/%{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
# install helper libs # install helper libs
install -d %{buildroot}%{incuslibdir} install -d %{buildroot}%{_libexecdir}/%{name}
install -m0755 -vp %{SOURCE110} %{buildroot}%{incuslibdir}/ install -m0755 -vp %{SOURCE110} %{buildroot}%{_libexecdir}/%{name}/
install -m0755 -vp %{gobuilddir}/lib/* %{buildroot}%{incuslibdir}/ install -m0755 -vp %{gobuilddir}/lib/* %{buildroot}%{_libexecdir}/%{name}/
# install manpages # install manpages
install -d %{buildroot}%{_mandir}/man1 install -d %{buildroot}%{_mandir}/man1
@@ -465,6 +463,7 @@ export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
%changelog %changelog
* Sat Apr 27 2024 Neal Gompa <ngompa@fedoraproject.org> - 6.0.0-1 * Sat Apr 27 2024 Neal Gompa <ngompa@fedoraproject.org> - 6.0.0-1
- Update to 6.0.0 - Update to 6.0.0
- Move libexec content to libexecdir
* Wed Mar 27 2024 Neal Gompa <ngompa@fedoraproject.org> - 0.7-1 * Wed Mar 27 2024 Neal Gompa <ngompa@fedoraproject.org> - 0.7-1
- Update to 0.7 - Update to 0.7